Move to IIFE style