Replace for loops with proper action functions

[Nikolas Huebecker]

The for loops should be replaced with actionable functions, i.e. forEach + map