Refactoring in Asn1 classes

2 files changed, 6 insertions, 14 deletions

diff --git a/crypto/src/asn1/ocsp/ResponderID.cs b/crypto/src/asn1/ocsp/ResponderID.cs
index 143b17339..bc8b7f731 100644
--- a/crypto/src/asn1/ocsp/ResponderID.cs
+++ b/crypto/src/asn1/ocsp/ResponderID.cs
@@ -10,27 +10,22 @@ namespace Org.BouncyCastle.Asn1.Ocsp
     {
         private readonly Asn1Encodable id;
 
-		public static ResponderID GetInstance(
-			object obj)
+		public static ResponderID GetInstance(object obj)
 		{
 			if (obj == null || obj is ResponderID)
 			{
 				return (ResponderID)obj;
 			}
 
-			if (obj is DerOctetString)
+			if (obj is Asn1OctetString octets)
 			{
-				return new ResponderID((DerOctetString)obj);
+				return new ResponderID(octets);
 			}
 
-			if (obj is Asn1TaggedObject)
+			if (obj is Asn1TaggedObject o)
 			{
-				Asn1TaggedObject o = (Asn1TaggedObject)obj;
-
 				if (o.TagNo == 1)
-				{
 					return new ResponderID(X509Name.GetInstance(o, true));
-				}
 
 				return new ResponderID(Asn1OctetString.GetInstance(o, true));
 			}
diff --git a/crypto/src/asn1/ocsp/ResponseData.cs b/crypto/src/asn1/ocsp/ResponseData.cs
index b18e1d623..b79301997 100644
--- a/crypto/src/asn1/ocsp/ResponseData.cs
+++ b/crypto/src/asn1/ocsp/ResponseData.cs
@@ -63,16 +63,13 @@ namespace Org.BouncyCastle.Asn1.Ocsp
 		{
 		}
 
-		private ResponseData(
-			Asn1Sequence seq)
+		private ResponseData(Asn1Sequence seq)
 		{
 			int index = 0;
 
 			Asn1Encodable enc = seq[0];
-			if (enc is Asn1TaggedObject)
+			if (enc is Asn1TaggedObject o)
 			{
-				Asn1TaggedObject o = (Asn1TaggedObject)enc;
-
 				if (o.TagNo == 0)
 				{
 					this.versionPresent = true;