Some more pep8 fixes.