Cleaning and better comments