POULPE-503 The small refactoring.