Refactor Game