Apply suggestions from code review
Apply suggestions from code review

Co-authored-by: Erik Krogh Kristensen <84d035ee7842ddf2fc3903c7395cfcd970f3b6a7@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