comment refactoring