fix: address core review findings

Co-authored-by: codex <codex@users.noreply.github.com>