Minor cleanup.
More vocabulary.