Cleaning up comments only