Cleaning and comments update