More comment and whitespace cleanup