Refactored tripService class