Added suggestions from the pull request