Removed some unnecessary closures