Address pull request comments