Closure improvement + tests