Apply suggestions from code review (2)
3 files changed