Ok. I will do so... but I think I would prefer doing that in a different PR. This one is already getting too big.