Further tidying from suggestions