Refactor Game and Player class