comments after refactoring