Address flake8 issues