Refactoring Travel

Refactoring Travel