Apply suggestions from code review
Apply suggestions from code review

Co-authored-by: Cornelius Riemenschneider <37fa8616e436faaa95fa69b2198f45a31e57dc12@github.com>
github/codeql,github/codeql,github/codeql,github/codeql,github/codeql,github/codeql,github/codeql,github/codeql,github/codeql,github/codeql,github/codeql,github/codeql,github/codeql,github/codeql,github/codeql