STY/TST: Another set of pep8 fixes