more tidying up and disambiguation