clean & comment