cleaning up comments and whitespace