Partial tidy-up