Apply suggestions from @RobPasMue code review

Co-authored-by: Roberto Pastor Muela <37798125+RobPasMue@users.noreply.github.com>

Author: yardasol