Some pep8/pylint cleanup