Formatting fixes from pep8 and pyflakes