Refactor trip to VJ
Refactor trip to VehicleJourney:
Improve after review
Merge pull request #158 from skywave/refactor

Refactor trip to VJ