Finished individual exercise, code is refactored, still passes all tests.