Rewrite some comments