move and rewrite comment