Cleaning and Comments