Clean up with flake8 (#24103)