more minor tidy-ups