helper extensions small code adjustments