comment and whitespace cleanup