comments refactoring...