General tidy-up.