Make helper utils functions static