Refactoring comment code