smaller methods
Merge branch 'master' of https://github.com/rcsole/shuttle