Removing `forEach` and using `map` for better readability

[yashLadha]

Using forEach in code is usually avoided because of the side-effects.