few tweaks
Merge pull request #2 from nigelsmall/master

Tidied up a bit and made a bit more pythonic