[Feat]Find and refactor-out closures

[Bnaya]

I think we still have some places we use closures instead of explicit variables.
We need to find them and refactor them out!