Move Rideshare Ride Queries to inner class or RideshareService