Reviewer 2 edits

Addressing reviewer 2 edits