Refactor comments