7.0 fix flakes8 (complete)

Adding on top of #12