more tidying up