Quick code tidy-up.