fixed the PR comments
Merge pull request #3 from MehdiK/PR-review-issues

fixed the PR comments