Tests passing, refactoring successful