Code Review PR

Go further with this helper.