method tidy
Merge branch 'master' of https://github.com/mdsumner/trip

cleanup