Some pylint cleanup.
Merge pull request #123 from bukzor/some_pylint

Some pylint cleanup.