#50 Closures refactor