Apply suggestions from code review

Commit

2 years ago

Apply suggestions from code review Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>