MAJ Kévin : (MAJ)improvement and simplification of the code