Tidied up some fit functions
Tidied up more of fit functions