Heaps of refactoring and 100% test coverage