Minor clean ups

Fixing some minor issues found with pylint.  I've done them in separate commits in case you don't want all ofg the fixes.  Feel free to squash if necessary.

Likely because that code was written by other people. We don't enforce stylistic consistency here because the preferred style is Kenneth's. If we did, we might use a tool like flake8, but Kenneth's style and pep8 do not overlap enough to bother trying to configure it. Also, a reminder, consistency is the hobgoblin of a foolish mind. Just because this is the only instance, does not validate your changing it.