Remove redundant IIFE, clean up comments