Cleaning up the comments a bit