Apply suggestions from @RobPasMue code review

Co-authored-by: Roberto Pastor Muela <[email protected]>

Author: yardasol