Refactor destructuring
Update for..of section