Further Exploration - Testing refactor

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