More pep8 fixes.