Started off with a pylint-induced cleanup and led into a bit of a refactor.
Merge pull request #5 from jnovinger/pylint_refactor

One true way. :+1: