Improve Game Class