More model tidying up