Cleaning and commenting.