* Modified .map.each to just .map in two cases; they were not necessary