Refactoring et arret manuel + Tests