Last few flake8 changes, only H202s remain