Another tidy-up try