Just a little more tidy-up