Apply suggestions from code review

Commit

51 days ago

Apply suggestions from code review Co-authored-by: Johannes Gäßler <johannesg@5d6.de>