Refactoring comments.