Flake8 fixup 1st pass