Some stylistic updates.