Refactor Game Model