Refactoring of Game class