JeromeLefebvre:refactoring