Refactoring
All tests passing. Refactoring is complete.