Formatting and style changes; no functional changes intended.