refactoring comments