Flake8 Fixes