fixed some remarks from the pull request