some more tidying up