Smaff refactor of UnifiedPushHelper