some more tidying