Way, way too much tidying in one go.
Merge pull request #110 from greboid/sometidying

Way, way too much tidying in one go.