Refactor Game Creator