Refactor, game thinker clarification