A lot of comment cleaning