Addressed reviewer comments.
7 files changed