Apply suggestions from code review

Commit

3 years ago

Apply suggestions from code review Co-authored-by: NielsRogge <48327001+NielsRogge@users.noreply.github.com>