Fixed a number of stylistic issues.