OCD Whitespace Cleanup