More pylint cleanup