changes suggested in PR review