Stylistic improvements.