Rewrite comments