Removed forEach for performance