Cleaning up comments