#POULPE-483 Some refactoring