Fix pep8 errors for latest import linter
6 files changed