Further Exploration - Testing refactor

I tried it and it workes, do you think the code is re-factored correctly?