Make pep8 tests pass #2