Refactor game and player classes