Apply suggestions from code review

Commit

181 days ago

Apply suggestions from code review Co-authored-by: Karoy Lorentey <klorentey@apple.com>