A little bit of tidy-up