Apply suggestions from code review

Commit

1 year ago

Apply suggestions from code review Co-authored-by: Delba de Oliveira <32464864+delbaoliveira@users.noreply.github.com>