Further work on fixing flake8 warnings