comments & cleaning