Minor revisions for better consistency.