follow-up: style adjustments (see GH-2)