Propose a two-step modification. Code-style/cleaning are massive changes...