Address comments on the pull request