clean up comments and whitespace