[Izkata]

Caveat: Try to time it carefully if the code is being actively developed, to reduce risk of merge conflicts and annoyances to the rest of the team. It just leads to a lot of "stop doing that!" and further resistance to that kind of refactoring.