Better logic flow in  Game class