Minor improvement
Renamed helper