Comment refactoring