Addressed pull request comments.