bit more tidying