Untested, refactored code