Refactor to use ES6 features, remove IIFE style as it's redundant.
Refactor to use some ES6 and to remove the IIFE code.