Quick tidy-up