Cleaning and commenting