A bit of cleaning and comments