minor code tidy-up.