yet more tidying