Stylistic improvements