Apply suggestions from code review

main

Commit

Soph4mo ago

Co-authored-by: Stefan Haubold stefan.haubold@hait.de