Addressed comments from the pull request