Cleaning up some more of the commenting