Whitespace and wrapped long lines
Don't need a after block
Only rescue from known expected error
Merge pull request #238 from IanVaughan/tidy

Tidy ups