pylint cleanup
more pylint cleanup