General stylistic improvements.