Cleaning up comments and whitespace