Cleaning and commenting #2