More flake8 fixups