Some stylistic changes.