Addressed issues from pull request comments.