Refactor Comment (with 2 'm')