Refactor that last solution...