Cleaning up some of the comments