diff --git a/enzevalos_iphone/Certificate.swift b/enzevalos_iphone/Certificate.swift
index fdaf83a1097e98f63a1052488a26530e40e746aa..5ad3a33b51451c993f55f42e1b5e5370b2771837 100644
--- a/enzevalos_iphone/Certificate.swift
+++ b/enzevalos_iphone/Certificate.swift
@@ -112,8 +112,6 @@ extension cert_info {
          
          if cStr != nil {
              swiftStr = String(cString: cStr!)
-             // same here
-             // cStr?.deallocate()
          }
          
          return swiftStr
diff --git a/enzevalos_iphone/SMIME.swift b/enzevalos_iphone/SMIME.swift
index 023d97c543d3387e46fefa052948fc37d868adca..4d47ed147c888fa7dbc0c94f93dbad30393611c3 100644
--- a/enzevalos_iphone/SMIME.swift
+++ b/enzevalos_iphone/SMIME.swift
@@ -127,12 +127,13 @@ class SMIME {
             if keys.count != 1 {
                 print("Incorrect amount of keys: ", keys.count)
                 continue
-                //todo exception
+                // ToDo exception
             }
             if certs.count == 0
             {
                 print("No certs")
-                continue//do exception
+                continue
+                // ToDo exception
             }
             certsAndKeysSplit.append((certs.joined(separator: "\r\n"), keys[0]))
         }
diff --git a/enzevalos_iphone/c/certificate-helpers.c b/enzevalos_iphone/c/certificate-helpers.c
index a8a2f211f0d2126e3e41665102808b4d1b828acf..44057539bde02a0da88097f91320e5d84de14697 100644
--- a/enzevalos_iphone/c/certificate-helpers.c
+++ b/enzevalos_iphone/c/certificate-helpers.c
@@ -32,9 +32,7 @@ cert_info * get_cert_data(const char *pem)
     
     emails = get_emails(cert);
     size = emails->size;
-    
-    //int size = info->num_emails; Unitialized memory, meaning i will grow beyond the real size ->SEGFAULT
-    
+        
     //ELIMINATED MAIN MEMORY LEAK; STILL HAVE A SMALL ONE: after running a couple of minutes nonstop loading certs 70mb
     
     info->num_emails = size;
@@ -71,7 +69,6 @@ char * get_issuer(X509 *cert) {
     bio_to_str(out, &res);
 deinit:
     BIO_free(out);
-    //X509_NAME_free(name);
     return res;
 }
 
@@ -85,7 +82,6 @@ char * get_subject(X509 *cert) {
     bio_to_str(out, &res);
 deinit:
     BIO_free(out);
-//    X509_NAME_free(name);
     return res;
 }
 
@@ -143,7 +139,6 @@ array_with_length *get_emails(X509 *cert) {
     res->arr = arr;
 deinit:
     sk_OPENSSL_STRING_free(list);
-    // X509_email_free(list);
     return res;
 }
 
diff --git a/enzevalos_iphone/c/certificate-helpers.h b/enzevalos_iphone/c/certificate-helpers.h
index e55116b7298b954414aa40d7963fe2d00d513d09..d96c2f67eec5835a14b364b2f6981e74c1b26d79 100644
--- a/enzevalos_iphone/c/certificate-helpers.h
+++ b/enzevalos_iphone/c/certificate-helpers.h
@@ -43,7 +43,6 @@ char * get_subject(X509 *cert);
 char * get_start_date(X509 *cert);
 char * get_end_date(X509 *cert);
 array_with_length *get_emails(X509 *cert);
-// X509 *get_cert_from_pem(const char *pem);
 cert_info * get_cert_data(const char *pem);
 
 cert_info * new_cert_info(void);
diff --git a/enzevalos_iphone/c/smime-helpers.c b/enzevalos_iphone/c/smime-helpers.c
index 0d5569e2a5df5b05e4b65e5de66977520d36bd36..020d6cdeeb5f43f6ffdf64058c25a06225c5360f 100644
--- a/enzevalos_iphone/c/smime-helpers.c
+++ b/enzevalos_iphone/c/smime-helpers.c
@@ -158,7 +158,6 @@ deinit:
     BIO_free(in);
     BIO_free(out); // also frees tmp
     sk_X509_pop_free(cert_stack, X509_free);
-    //X509_free(rec_cert);
     return res;
 }