[esafak]

Just do it in a follow up PR to keep them atomic. But do clean up; it's so easy now.

[jffhn]

Before, not after: when the code makes it hard to implement a new feature (the definition of technical debt: code that is properly designed but only for previous features), first refactor the code to make the feature easy to implement, then implement the feature.