a bit more tidying up