Made the test run again, now let the fun of refactoring begin!