Refactor in Game