Add IIFE for initialize, reorganization