A little bit of refactoring
All tests pass again