Lots more tidy-up