Edits due to reviewers comments.

I've made the requested edits from reviewers.  Please merge these changes that address the issues raised by reviewers.