still more tidying up