Minor code cleanup

In an attempt to familiarize myself with this code base, I've ran pylint on the code and fixed some minor warnings. None of these changes should alter the behavior in any way.

I don't feel comfortable making changes that modify behavior at this point in time, since I do not have an environment to test changes. Perhaps I can knock out an item or two in the TODO list in the future.