Refactored GameGenerator