Cleaning up some more comments