Fix flake8 issues