Comments and cleaning