Improve Game class;