Apply suggestions from code review Co-authored-by: legendofmiracles <30902201+legendofmiracles@users.noreply.github.com>