minor comments refactoring