Closure usage now almost clear