Fix flake8 concerns