Even more pylint fixes (mostly pep8)