bit more tidying up