Refactor comments.