Comments and whitespace fix