Apply suggestions from code review

Commit

5 days ago

Apply suggestions from code review Co-authored-by: Luke Sandberg <lukesandberg@users.noreply.github.com>