Cleaned some closures