Minor tidy-up