improve helper utilities