clean & minimize comments