More general stylistic improvements.