Minor edits
Merged minor edits