How about using the "Black" code formatter on the whole codebase?

https://github.com/psf/black

It will eliminate all of the formatting problems and discussions and subjective preferences and holy wars.