Pep8/pylint cleanup.