Further tidying from Roger