flake8 fixes part 2