Updated to address pull request comments.