More PEP8/pylint cleanup