Refactored game object