Addressing comments from the pull request