More stylistic improvements.