Yes, I will factorize this part of the code.