OMG all tests are passing again.
Refactoring