diff --git a/lib/PayPro.js b/lib/PayPro.js
index 358bf8d..369a3f0 100644
--- a/lib/PayPro.js
+++ b/lib/PayPro.js
@@ -354,43 +354,18 @@ rfc5280.EDIPartyName = asn1.define('EDIPartyName', function() {
   );
 });
 
-var DirectoryString =
-rfc5280.DirectoryString = asn1.define('DirectoryString', function() {
-  this.choice({
-    teletexString: this.use(TeletexString),
-    printableString: this.use(PrintableString),
-    universalString: this.use(UniversalString),
-    utf8String: this.use(UTF8String),
-    bmpString: this.use(BMPString)
-  });
-});
-
 // https://www.google.com/search?q=TeletexString
 // http://msdn.microsoft.com/en-us/library/windows/desktop/bb540814(v=vs.85).aspx
 
-var TeletexString =
-rfc5280.TeletexString = asn1.define('TeletexString', function() {
-  this.t61str();
-});
-
-var PrintableString =
-rfc5280.PrintableString = asn1.define('PrintableString', function() {
-  this.printstr();
-});
-
-var UniversalString =
-rfc5280.UniversalString = asn1.define('UniversalString', function() {
-  this.unistr();
-});
-
-var UTF8String =
-rfc5280.UTF8String = asn1.define('UTF8String', function() {
-  this.utf8str();
-});
-
-var BMPString =
-rfc5280.BMPString = asn1.define('BMPString', function() {
-  this.bmpstr();
+var DirectoryString =
+rfc5280.DirectoryString = asn1.define('DirectoryString', function() {
+  this.choice({
+    teletexString: this.t61str(),
+    printableString: this.printstr(),
+    universalString: this.unistr(),
+    utf8String: this.utf8str(),
+    bmpString: this.bmpstr()
+  });
 });
 
 // var SubjectKeyIdentifier =