comments clean up