small changes according to comments in the pull request