Refactoring du code (14 warnings restants)