Coding style and whitespace cleanup.