Use direct anon function
Additional cleanup.