Even more tidying