Cleaning and Commenting