Comment and clean