Refactorisation part 2
Refactorisation part 2
Refactorisation part 2