diff --git a/src/crypto/crl.c b/src/crypto/crl.c
index fa6ae86..8e1c135 100644
--- a/src/crypto/crl.c
+++ b/src/crypto/crl.c
@@ -3,32 +3,29 @@
 #include "crypto.h"
 
 
-static X509_REVOKED * X509_REVOKED_dup(X509_REVOKED *orig)
-{
+static X509_REVOKED * X509_REVOKED_dup(X509_REVOKED *orig) {
     X509_REVOKED *dupe = NULL;
 
     dupe = X509_REVOKED_new();
-    if(dupe == NULL)
+    if (dupe == NULL) {
         return NULL;
-    if(orig->serialNumber)
-    {
+    }
+    if (orig->serialNumber) {
         dupe->serialNumber = M_ASN1_INTEGER_dup(orig->serialNumber); 
     }
-    if(orig->revocationDate)
-    {
+    if (orig->revocationDate) {
         dupe->revocationDate = M_ASN1_INTEGER_dup(orig->revocationDate); 
     }
-    if(orig->extensions)
-    {
+    if (orig->extensions) {
         STACK_OF(X509_EXTENSION) *sk = NULL;
         X509_EXTENSION * ext;
         int j;
 
         sk = sk_X509_EXTENSION_new_null();
-        for(j = 0; j < sk_X509_EXTENSION_num(orig->extensions); j++) {
-             ext = sk_X509_EXTENSION_value(orig->extensions, j);
-             ext = X509_EXTENSION_dup(ext);
-             sk_X509_EXTENSION_push(sk, ext);
+        for (j = 0; j < sk_X509_EXTENSION_num(orig->extensions); j++) {
+            ext = sk_X509_EXTENSION_value(orig->extensions, j);
+            ext = X509_EXTENSION_dup(ext);
+            sk_X509_EXTENSION_push(sk, ext);
         }
         dupe->extensions = sk;
     }
@@ -43,41 +40,43 @@
 @return: A tuple of Revoked objects.\n\
 ";
 static PyObject *
-crypto_CRL_get_revoked(crypto_CRLObj *self, PyObject *args)
-{
+crypto_CRL_get_revoked(crypto_CRLObj *self, PyObject *args) {
     int j, num_rev;
     X509_REVOKED *r = NULL;
     PyObject *obj = NULL, *rev_obj;
 
-    if (!PyArg_ParseTuple(args, ":get_revoked"))
+    if (!PyArg_ParseTuple(args, ":get_revoked")) {
         return NULL;
+    }
 
     num_rev = sk_X509_REVOKED_num(self->crl->crl->revoked);
-    if(num_rev < 0) 
-    {
+    if (num_rev < 0) {
         Py_INCREF(Py_None);
         return Py_None;
     }
-    if ((obj = PyTuple_New(num_rev)) == NULL)
+    if ((obj = PyTuple_New(num_rev)) == NULL) {
         return NULL;
+    }
 
-    for(j = 0; j < num_rev; j++) 
-    {
-         r = sk_X509_REVOKED_value(self->crl->crl->revoked, j);
-         r = X509_REVOKED_dup(r);
-         if( r == NULL ) 
-             goto error;
-         rev_obj = (PyObject *) crypto_Revoked_New(r);
-         if( rev_obj == NULL )
-             goto error;
-         r = NULL; /* it's now owned by rev_obj */
-         PyTuple_SET_ITEM(obj, j, rev_obj);
+    for (j = 0; j < num_rev; j++) {
+        r = sk_X509_REVOKED_value(self->crl->crl->revoked, j);
+        r = X509_REVOKED_dup(r);
+        if (r == NULL ) {
+            goto error;
+        }
+        rev_obj = (PyObject *) crypto_Revoked_New(r);
+        if (rev_obj == NULL) {
+            goto error;
+        }
+        r = NULL; /* it's now owned by rev_obj */
+        PyTuple_SET_ITEM(obj, j, rev_obj);
     }
     return obj;
 
  error:
-    if(r)
-       X509_REVOKED_free(r);
+    if (r) {
+        X509_REVOKED_free(r);
+    }
     Py_XDECREF(obj);
     return NULL;
 }
@@ -90,19 +89,20 @@
 @return: None\n\
 ";
 static PyObject *
-crypto_CRL_add_revoked(crypto_CRLObj *self, PyObject *args, PyObject *keywds)
-{
+crypto_CRL_add_revoked(crypto_CRLObj *self, PyObject *args, PyObject *keywds) {
     crypto_RevokedObj * rev_obj = NULL;
     static char *kwlist[] = {"revoked", NULL};
     X509_REVOKED * dup;
 
     if (!PyArg_ParseTupleAndKeywords(args, keywds, "O!:add_revoked", 
-        kwlist, &crypto_Revoked_Type, &rev_obj))
+        kwlist, &crypto_Revoked_Type, &rev_obj)) {
         return NULL;
+    }
 
     dup = X509_REVOKED_dup( rev_obj->revoked );
-    if(dup == NULL)
+    if (dup == NULL) {
         return NULL;
+    }
     X509_CRL_add0_revoked(self->crl, dup);
 
     Py_INCREF(Py_None);
@@ -119,72 +119,72 @@
 @return: None\n\
 ";
 static PyObject *
-crypto_CRL_export(crypto_CRLObj *self, PyObject *args, PyObject *keywds)
-{
-	int ret, buf_len, type = X509_FILETYPE_PEM, days = 100;
-	char *temp;
-	BIO *bio;
-	PyObject *buffer;
-	crypto_PKeyObj *key;
-	ASN1_TIME *tmptm;
-	crypto_X509Obj *x509;	
-        static char *kwlist[] = {"cert", "key", "type", "days", NULL};
+crypto_CRL_export(crypto_CRLObj *self, PyObject *args, PyObject *keywds) {
+    int ret, buf_len, type = X509_FILETYPE_PEM, days = 100;
+    char *temp;
+    BIO *bio;
+    PyObject *buffer;
+    crypto_PKeyObj *key;
+    ASN1_TIME *tmptm;
+    crypto_X509Obj *x509;
+    static char *kwlist[] = {"cert", "key", "type", "days", NULL};
     
-	if (!PyArg_ParseTupleAndKeywords(args, keywds, "O!O!|ii:dump_crl", kwlist,
-			      &crypto_X509_Type, &x509, 
-                              &crypto_PKey_Type, &key, &type, &days))
-		return NULL;
+    if (!PyArg_ParseTupleAndKeywords(args, keywds, "O!O!|ii:dump_crl", kwlist,
+                                     &crypto_X509_Type, &x509, 
+                                     &crypto_PKey_Type, &key, &type, &days)) {
+        return NULL;
+    }
     
-	bio=BIO_new(BIO_s_mem());
-	tmptm = ASN1_TIME_new();
-	if (!tmptm)
-		return 0;
-	X509_gmtime_adj(tmptm,0);
-	X509_CRL_set_lastUpdate(self->crl, tmptm);
-	X509_gmtime_adj(tmptm,days*24*60*60);
-	X509_CRL_set_nextUpdate(self->crl, tmptm);
-	ASN1_TIME_free(tmptm);
-	X509_CRL_set_issuer_name(self->crl, X509_get_subject_name(x509->x509));
-	X509_CRL_sign(self->crl, key->pkey, EVP_md5());
-        switch (type)
-        {
-            case X509_FILETYPE_PEM:
-	        ret = PEM_write_bio_X509_CRL(bio, self->crl);
-                break;
+    bio = BIO_new(BIO_s_mem());
+    tmptm = ASN1_TIME_new();
+    if (!tmptm) {
+        return 0;
+    }
+    X509_gmtime_adj(tmptm,0);
+    X509_CRL_set_lastUpdate(self->crl, tmptm);
+    X509_gmtime_adj(tmptm,days*24*60*60);
+    X509_CRL_set_nextUpdate(self->crl, tmptm);
+    ASN1_TIME_free(tmptm);
+    X509_CRL_set_issuer_name(self->crl, X509_get_subject_name(x509->x509));
+    X509_CRL_sign(self->crl, key->pkey, EVP_md5());
+    switch (type) {
+        case X509_FILETYPE_PEM:
+            ret = PEM_write_bio_X509_CRL(bio, self->crl);
+            break;
 
-            case X509_FILETYPE_ASN1:
-                ret = (int) i2d_X509_CRL_bio(bio, self->crl);
-                break;
+        case X509_FILETYPE_ASN1:
+            ret = (int) i2d_X509_CRL_bio(bio, self->crl);
+            break;
 
-            case X509_FILETYPE_TEXT:
-                ret = X509_CRL_print(bio, self->crl);
-                break;
+        case X509_FILETYPE_TEXT:
+            ret = X509_CRL_print(bio, self->crl);
+            break;
 
-            default:
-                PyErr_SetString(PyExc_ValueError,
-                        "type argument must be FILETYPE_PEM, FILETYPE_ASN1, or FILETYPE_TEXT");
-                return NULL;
-        };
-        if( ! ret )
-        {
-            exception_from_error_queue(crypto_Error);
-            BIO_free(bio);
+        default:
+            PyErr_SetString(
+                PyExc_ValueError,
+                "type argument must be FILETYPE_PEM, FILETYPE_ASN1, or FILETYPE_TEXT");
             return NULL;
-        }
-	buf_len = BIO_get_mem_data(bio, &temp);
-	buffer = PyString_FromStringAndSize(temp, buf_len);
-	BIO_free(bio);
-	return buffer;
+    }
+    if (!ret) {
+        exception_from_error_queue(crypto_Error);
+        BIO_free(bio);
+        return NULL;
+    }
+    buf_len = BIO_get_mem_data(bio, &temp);
+    buffer = PyString_FromStringAndSize(temp, buf_len);
+    BIO_free(bio);
+    return buffer;
 }
 
 crypto_CRLObj *
-crypto_CRL_New(X509_CRL *crl)
-{
+crypto_CRL_New(X509_CRL *crl) {
     crypto_CRLObj *self;
 
     self = PyObject_New(crypto_CRLObj, &crypto_CRL_Type);
-    if (self==NULL)
-	    return NULL;
+    if (self == NULL) {
+        return NULL;
+    }
     self->crl = crl;
     return self;
 }
@@ -198,8 +198,7 @@
     { #name, (PyCFunction)crypto_CRL_##name, METH_VARARGS, crypto_CRL_##name##_doc }
 #define ADD_KW_METHOD(name)        \
     { #name, (PyCFunction)crypto_CRL_##name, METH_VARARGS | METH_KEYWORDS, crypto_CRL_##name##_doc }
-static PyMethodDef crypto_CRL_methods[] =
-{
+static PyMethodDef crypto_CRL_methods[] = {
     ADD_KW_METHOD(add_revoked),
     ADD_METHOD(get_revoked),
     ADD_KW_METHOD(export),
@@ -209,14 +208,12 @@
 
 
 static PyObject *
-crypto_CRL_getattr(crypto_CRLObj *self, char *name)
-{
+crypto_CRL_getattr(crypto_CRLObj *self, char *name) {
     return Py_FindMethod(crypto_CRL_methods, (PyObject *)self, name);
 }
 
 static void
-crypto_CRL_dealloc(crypto_CRLObj *self)
-{
+crypto_CRL_dealloc(crypto_CRLObj *self) {
     X509_CRL_free(self->crl);
     self->crl = NULL;
 
@@ -232,11 +229,11 @@
 ";
 
 static PyObject* crypto_CRL_new(PyTypeObject *subtype, PyObject *args, PyObject *kwargs) {
-    	if (!PyArg_ParseTuple(args, ":CRL")) {
-		return NULL;
-    	}
-	
-    	return (PyObject *)crypto_CRL_New(X509_CRL_new());
+    if (!PyArg_ParseTuple(args, ":CRL")) {
+        return NULL;
+    }
+    
+    return (PyObject *)crypto_CRL_New(X509_CRL_new());
 }
 
 PyTypeObject crypto_CRL_Type = {
@@ -282,13 +279,12 @@
 };
 
 int init_crypto_crl(PyObject *module) {
-       if(PyType_Ready(&crypto_CRL_Type) < 0) {
-       	       return 0;
+       if (PyType_Ready(&crypto_CRL_Type) < 0) {
+                  return 0;
        }
 
        if (PyModule_AddObject(module, "CRL", (PyObject *)&crypto_CRL_Type) != 0) {
-       	       return 0;
+                  return 0;
        }
        return 1;
 }
-