#POULPE-483 - Refactoring