minor fixes to use the helperclass
minor fixes to use the helperclass