minor tidy-up