STY: More pep8 fixes.