Refine: Closures

Done