Fix Pylint warnings

Supersedes #30