Removing usage of forEach so that return does what its supposed to