removing ' || undefined'