Flake8 cleanups