A little bit of tidying up