Change helper to static function