[Refactor] More foreach brackets