Numerous stylistic updates.