Switch to Array.forEach() where possible