I'd be onboard with that. To make reviewing easier, it'd be good if you could do the refactor in a commit, then add the additional code on top in another commit