flake8 changes - hopefully last ones.