Refactoring for comments