comments for refactoring