Some pep8 fixes