Minor changes for the pull request