Ok. Sorry, I didn't understand the scope of the refactoring you were
suggesting. Thanks for the explanation.