Minor code tidy-up