Accounted for comments on pull request