addressed comments on pull request