whitespace cleanup and comments