Apply suggestions from code review

3 files changed