fixing pull request comments
fixing pull request comments