Propose a two-step modification. Code-style/cleaning are massive changes...
More code-style removal.
Back with clean/code-style modifications.