Refactor for clarity
Passing tests