Source tidy up
Merge pull request #2 from BlueBayTravel/master

Source tidy up