code style and whitespace cleanup