comment and whitespace change