Refactoring du code

Simplifier la maintenance