Updated for pull request comments