Revert "merge"

This reverts commit 1225adfafbe4ae57faee4568a6c0d85b18469cc0.
Revert "change each closure into for loop"

This reverts commit ab114375260ce789bc06b45083c96c8020b411ce.