dave - more tidying