Code style and whitespace cleanup