Yet more tidying