Major stylistic improvements.