Made changes from pull request review.