Addressed comments from pull request.
2 files changed