commenting and cleaning