More pylint cleanup.
Merge pull request #124 from bukzor/clean_up_stuff

More pylint cleanup.