Asn1 GetInstance refactoring

1 files changed, 12 insertions, 10 deletions

diff --git a/crypto/src/asn1/DerGeneralString.cs b/crypto/src/asn1/DerGeneralString.cs
index e6637732a..6a378307d 100644
--- a/crypto/src/asn1/DerGeneralString.cs
+++ b/crypto/src/asn1/DerGeneralString.cs
@@ -22,21 +22,23 @@ namespace Org.BouncyCastle.Asn1
 
         public static DerGeneralString GetInstance(object obj)
         {
-            if (obj == null || obj is DerGeneralString)
-            {
-                return (DerGeneralString) obj;
-            }
-            else if (obj is IAsn1Convertible)
+            if (obj == null)
+                return null;
+
+            if (obj is DerGeneralString derGeneralString)
+                return derGeneralString;
+
+            if (obj is IAsn1Convertible asn1Convertible)
             {
-                Asn1Object asn1Object = ((IAsn1Convertible)obj).ToAsn1Object();
-                if (asn1Object is DerGeneralString)
-                    return (DerGeneralString)asn1Object;
+                Asn1Object asn1Object = asn1Convertible.ToAsn1Object();
+                if (asn1Object is DerGeneralString converted)
+                    return converted;
             }
-            else if (obj is byte[])
+            else if (obj is byte[] bytes)
             {
                 try
                 {
-                    return (DerGeneralString)Meta.Instance.FromByteArray((byte[])obj);
+                    return (DerGeneralString)Meta.Instance.FromByteArray(bytes);
                 }
                 catch (IOException e)
                 {