comments refactoring