Also moved && and || to ends of lines instead of start. Fixed misc vertical alignments and some { needed newlining.