pep8/pylint cleanup.