Addressing more comments on pull request