flake8 clean-up