[jf22]

All that cleanup can be done with AI and then you can add guidance to the codebase so that the next LLM will do a better job at conforming.