just a bit of a tidy-up