Overall tidy-up