commment cleanup