Apply suggestions from code review
Apply suggestions from code review

Co-authored-by: Aditya Sharad <8cd93537b055980fa3fc3d66f691bf5fd60623d6@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