More OCD whitespace cleanup