Addressed the additional pull request comments.