pylint checks
Merge pull request #205 from phracek/master

Changes based on pylint output