Changes based on code review
2 files changed