diff --git a/src/pygit2/diff.c b/src/pygit2/diff.c
index 5b72439..81751ae 100644
--- a/src/pygit2/diff.c
+++ b/src/pygit2/diff.c
@@ -196,9 +196,9 @@ PyObject *
 Diff_changes(Diff *self)
 {
 
-    if (self->diff_changes == NULL){
+    if (self->diff_changes == NULL) {
         self->diff_changes = PyDict_New();
-        
+
         git_diff_foreach(
             self->diff,
             self->diff_changes,
@@ -239,7 +239,7 @@ static int
 Hunk_init(Hunk *self, PyObject *args, PyObject *kwds)
 {
     self->header = NULL;
-    
+
     self->old_file = NULL;
     self->old_start = 0;
     self->old_lines = 0;
@@ -250,7 +250,7 @@ Hunk_init(Hunk *self, PyObject *args, PyObject *kwds)
 
     self->old_oid = NULL;
     self->new_oid = NULL;
-    
+
     self->data = PyList_New(0);
     if (self->data == NULL) {
         Py_XDECREF(self);
diff --git a/src/pygit2/object.c b/src/pygit2/object.c
index 172cf3f..c990fd2 100644
--- a/src/pygit2/object.c
+++ b/src/pygit2/object.c
@@ -176,7 +176,7 @@ wrap_object(git_object *c_object, Repository *repo)
 
     if (py_obj) {
         py_obj->obj = c_object;
-				if (repo) {
+        if (repo) {
             py_obj->repo = repo;
             Py_INCREF(repo);
         }
diff --git a/src/pygit2/repository.c b/src/pygit2/repository.c
index a150253..2754591 100644
--- a/src/pygit2/repository.c
+++ b/src/pygit2/repository.c
@@ -182,7 +182,7 @@ Repository_head(Repository *self)
     oid = git_reference_oid(head);
     pyobj = lookup_object(self, oid, GIT_OBJ_COMMIT);
     git_reference_free(head);
-    return pyobj; 
+    return pyobj;
 }
 
 
@@ -214,14 +214,14 @@ Repository_revparse_single(Repository *self, PyObject *py_spec)
 
     /* 2- Lookup */
     err = git_revparse_single(&c_obj, self->repo, c_spec);
-    
-    if (err < 0)  {
+
+    if (err < 0) {
         PyObject *err_obj = Error_set_str(err, c_spec);
         free(c_spec);
         return err_obj;
     }
     free(c_spec);
-    
+
     return wrap_object(c_obj, self);
 }
 
@@ -634,7 +634,7 @@ Repository_lookup_reference(Repository *self, PyObject *py_name)
 
     /* 2- Lookup */
     err = git_reference_lookup(&c_reference, self->repo, c_name);
-    if (err < 0)  {
+    if (err < 0) {
         PyObject *err_obj = Error_set_str(err, c_name);
         free(c_name);
         return err_obj;
diff --git a/src/pygit2/tree.c b/src/pygit2/tree.c
index fdd20a7..c3921af 100644
--- a/src/pygit2/tree.c
+++ b/src/pygit2/tree.c
@@ -250,7 +250,7 @@ Tree_getitem(Tree *self, PyObject *value)
     path = py_path_to_c_str(value);
     if (path == NULL)
         return NULL;
-    
+
     err = git_tree_entry_bypath(&entry, self->tree, path);
     free(path);
 
diff --git a/test/test_refs.py b/test/test_refs.py
index 5ba77e1..b61d855 100644
--- a/test/test_refs.py
+++ b/test/test_refs.py
@@ -175,9 +175,9 @@ class ReferencesTest(utils.RepoTestCase):
         reference = self.repo.lookup_reference('refs/tags/version1')
         self.assertEqual(reference.hex, LAST_COMMIT)
 
-        # try to create existing reference 
-        self.assertRaises(ValueError, self.repo.create_reference, 
-        'refs/tags/version1', LAST_COMMIT)
+        # try to create existing reference
+        self.assertRaises(ValueError, self.repo.create_reference,
+                          'refs/tags/version1', LAST_COMMIT)
 
         # try to create existing reference with force
         reference =  self.repo.create_reference('refs/tags/version1',
@@ -195,8 +195,8 @@ class ReferencesTest(utils.RepoTestCase):
 
 
         # try to create existing symbolic reference
-        self.assertRaises(ValueError, self.repo.create_reference, 
-        'refs/tags/beta','refs/heads/master', symbolic=True)
+        self.assertRaises(ValueError, self.repo.create_reference,
+                          'refs/tags/beta','refs/heads/master', symbolic=True)
 
         # try to create existing symbolic reference with force
         reference =  self.repo.create_reference('refs/tags/beta',