And yet more flake8 fixes

Mostly import alphabetical order errors and space after multiline doc