Refactoring TripService