style and whitespace cleanup