and more tidying up