refactoring: comments