more cleaning and commenting