Yeah. Great. But i prefer this re-factoring in a separate PR. What do you say?