Commit one last refactoring before I rework the Execute function.