more pylint cleanup