Refactoring avant pres