Simplify usage, fix closures