Apply suggestions from code review

Commit

3 years ago

Apply suggestions from code review Co-authored-by: 8bitmp3 <19637339+8bitmp3@users.noreply.github.com>