Tidy up routes
Merge pull request #5 from theodi/feature-tidy-up-routes

Tidy up routes