untested refactoring.