Tidy-ups following review by Aled