Change yield to return in cases where only 1 result will ever be returned