Passing tests, let's refactor