Finished clean up of rec model and suggestions