[Review] Suggested Improvements by @f-schmitt-zih