style fixes only (no behaviour change)