Pylint suggested improvements.
Merge pull request #15 from tomgalloway/feature/pylint_improvements

Pylint suggested improvements.
Merge remote-tracking branch 'upstream/master' into develop