flake8 cleanups