refactoring: some