Merged all the parameters of the fitting in one place and removed redundant ones from different files.