Cleaning up comments a bit