Move pep8 earlier