refactoring Comment