Addressing some comments on the pull request