Addressed code review comments.
6 files changed