Cleaning up Comments