Make changes suggested in PR review
3 files changed