Minor refactor.
Mainly PEP8 stuff.
Merge pull request #29 from git-harry/master

Mainly PEP8 stuff.