Cleaning up comments
More cleanup