Don't do forEach loop twice
Reduce indent