Apply suggestions from code review

Commit

9 days ago

Apply suggestions from code review Co-authored-by: Álvaro Somoza <asomoza@users.noreply.github.com>