changes following pull request code review