* Replace For loop with map.forEach (#172)