A bit of tidying.