fix: code review improvements#2

drvoss wants to merge 1 commit intogolbin:maingolbin/ssaju:mainfrom

drvoss:fix/code-review-improvementsdrvoss/ssaju:fix/code-review-improvementsCopy head branch name to clipboard