Minor tidying up of the name==main part