light cleaning and comment changes