Tidy-up changes