Wild refactor