Remove unnecessary comments and fix whitespace
Merge branch 'mass-cleanup'