Apply suggestions from code review

main

Commit

gtrrz-victor5mo ago

Co-authored-by: Paulo Gomes paulo.gomes.uk@gmail.com