Fixed an issue
Removed closures