Partial tidy-up 2