Comments and whitespace cleanup