Cleaning and commenting #1