It should be ok but this style is not easy to maintain IMO.
For now I will let this part as is.

I agree we need a better way to handle this.