Clean code is happy code

Code refactoring and clean-up prompted by pylint. This should make the code
more readable and maintainable.

This release should have no change functionality over the previous release.