changes done as per comment made in the pull request