Apply suggestions from code review
Apply suggestions from code review

Co-Authored-By: Shati Patel <e0b0b2c49ad144adb8e8045d2472c7c17f3344ff@users.noreply.github.com>
Co-Authored-By: Sauyon Lee <4fa7178e9c80de468617c1db7a80987d33153480@github.com>
github/codeql-go,github/codeql,github/codeql,github/codeql-go,github/codeql,github/codeql,github/codeql-go,github/codeql,github/codeql,github/codeql,github/codeql,github/codeql-go,github/codeql,github/codeql,github/codeql,github/codeql,github/codeql,github/codeql,github/codeql