Addressing comments on pull request