WIP: Flake8 fixes