Handled review points suggested in the pull request by Dan