flake8 changes I've accumulated