Some stylistic improvements.