finished cleaning and commenting