MORTEVIELLE: Some renaming, remove useless variables, add debugger