Avancement du refactoring.