Fixed pull request remarks