comments and cleaning