Clean/Re-factor the Route class.
Merge branch 'feature/route-cleanup' into develop