incorporated suggested changes after pull request