Minor edits based on comments