More fixes for pylint

Builds upon #17 and adds more fixes for pylint.