A little bit of tidying