Improve IIFE