Shorten
Merge pull request #1 from sargegoodweather/master

Reorganise (but not shorten.)