refactorings
Merge branch 'master' of https://github.com/mattschofield/travel-hub-manch