Apply suggestions from code review
Apply suggestions from code review

Co-authored-by: Shati Patel <e0b0b2c49ad144adb8e8045d2472c7c17f3344ff@users.noreply.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