cleaned up fitter