Pylint/pep8 cleanup.