Updated per pull request comments