Cleaning and updating comments