Updates to address pull request comments