more tweaks to flake8