some comment cleaning