pylint fixups
more pylint fixups