flake8 + cleanup