PEP8 fixes
More pep8 fixes