test & comment tidy-ups

no functional changes