delivery partie refactoring