Flake8 cleanup