Cleaning and change in the order of parameters in inmf_main.m