All tests green. Now we can do refactoring!