cleaning and comment functionality