Small cleaning and comments