Yea I think it's worth doing, assuming more one-offs will creep into this template over time it will keep it clean.