Closure-ifying
Closure-ifying