tidying up of model mover