cleaning and commentig