Whitespace and formatting fixes. Saw some C-style braces and other... oddness.