some cleaning and comments