Couple more sets of tidying.