OCD whitespace cleanup