Addressed code review comments.
2 files changed