Cleaning and commenting!