tidying up models