Test passed. Kata solved... refactoring time :]