Some Pep8 fixes