diff --git a/examples/main.c b/examples/main.c
index 89b1317cf855c91c61f8b22dc29a7412a75ef7a0..c8a1780c5ba5432ff9e713853c578666d1cc3a6f 100644
--- a/examples/main.c
+++ b/examples/main.c
@@ -155,8 +155,7 @@ int main(int argc, char *argv[]) {
 
 /* Let's pin the main thread */
 #if defined(HAVE_SETAFFINITY) && defined(HAVE_LIBNUMA) && defined(_GNU_SOURCE)
-  if (((ENGINE_POLICY) & engine_policy_setaffinity) ==
-      engine_policy_setaffinity)
+  if (((ENGINE_POLICY)&engine_policy_setaffinity) == engine_policy_setaffinity)
     engine_pin();
 #endif
 
diff --git a/src/cell.c b/src/cell.c
index 1362828c544f20859c6583ffde37e26a78a15db2..7ced653d2e1da294a598ea86045e6e3bb5577f63 100644
--- a/src/cell.c
+++ b/src/cell.c
@@ -1283,7 +1283,7 @@ void cell_clean(struct cell *c) {
     if (c->sort[i] != NULL) {
       free(c->sort[i]);
       c->sort[i] = NULL;
-      }
+    }
 
   /* Recurse */
   for (int k = 0; k < 8; k++)
diff --git a/src/engine.c b/src/engine.c
index dbd65d248f35469bb8576d5062ea8053cf8611ae..e1990a9042938982d7f764e79e7d1b0d65d2649d 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -2610,8 +2610,8 @@ void engine_marktasks_mapper(void *map_data, int num_elements,
       /* Only interested in density tasks as of here. */
       if (t->subtype == task_subtype_density) {
 
-	/* Too much particle movement? */
-	if (cell_need_rebuild_for_pair(ci, cj)) *rebuild_space = 1;
+        /* Too much particle movement? */
+        if (cell_need_rebuild_for_pair(ci, cj)) *rebuild_space = 1;
 
 #ifdef WITH_MPI
         /* Activate the send/recv tasks. */
diff --git a/tests/test125cells.c b/tests/test125cells.c
index d4490c47ae0b3db22372457d94cae78c4e4d9a08..1bddd5dd2d4933e3b2d6c802d1325f3b88ba6ba5 100644
--- a/tests/test125cells.c
+++ b/tests/test125cells.c
@@ -340,8 +340,7 @@ struct cell *make_cell(size_t n, const double offset[3], double size, double h,
   // shuffle_particles(cell->parts, cell->count);
 
   cell->sorted = 0;
-  for (int k = 0; k < 13; k++)
-    cell->sort[k] = NULL;
+  for (int k = 0; k < 13; k++) cell->sort[k] = NULL;
 
   return cell;
 }
@@ -350,8 +349,7 @@ void clean_up(struct cell *ci) {
   free(ci->parts);
   free(ci->xparts);
   for (int k = 0; k < 13; k++)
-    if (ci->sort[k] != NULL)
-      free(ci->sort[k]);
+    if (ci->sort[k] != NULL) free(ci->sort[k]);
   free(ci);
 }
 
diff --git a/tests/test27cells.c b/tests/test27cells.c
index 38ed5b7ef4419945e2c6e6bf4d342c709a884536..c4df8356eb6494cc34b91c6ab5038b3866b14056 100644
--- a/tests/test27cells.c
+++ b/tests/test27cells.c
@@ -178,8 +178,7 @@ struct cell *make_cell(size_t n, double *offset, double size, double h,
   shuffle_particles(cell->parts, cell->count);
 
   cell->sorted = 0;
-  for (int k = 0; k < 13; k++)
-    cell->sort[k] = NULL;
+  for (int k = 0; k < 13; k++) cell->sort[k] = NULL;
 
   return cell;
 }
@@ -187,8 +186,7 @@ struct cell *make_cell(size_t n, double *offset, double size, double h,
 void clean_up(struct cell *ci) {
   free(ci->parts);
   for (int k = 0; k < 13; k++)
-    if (ci->sort[k] != NULL)
-      free(ci->sort[k]);
+    if (ci->sort[k] != NULL) free(ci->sort[k]);
   free(ci);
 }
 
diff --git a/tests/testPair.c b/tests/testPair.c
index e1327ba9eafff8ad6d5d00af681f2a5c82bed13f..e0e813f31531fb1c8d2e24e417a43ac4d07ecf7e 100644
--- a/tests/testPair.c
+++ b/tests/testPair.c
@@ -121,8 +121,7 @@ struct cell *make_cell(size_t n, double *offset, double size, double h,
   shuffle_particles(cell->parts, cell->count);
 
   cell->sorted = 0;
-  for (int k = 0; k < 13; k++)
-    cell->sort[k] = NULL;
+  for (int k = 0; k < 13; k++) cell->sort[k] = NULL;
 
   return cell;
 }
@@ -130,8 +129,7 @@ struct cell *make_cell(size_t n, double *offset, double size, double h,
 void clean_up(struct cell *ci) {
   free(ci->parts);
   for (int k = 0; k < 13; k++)
-    if (ci->sort[k] != NULL)
-      free(ci->sort[k]);
+    if (ci->sort[k] != NULL) free(ci->sort[k]);
   free(ci);
 }
 
diff --git a/tests/testPeriodicBC.c b/tests/testPeriodicBC.c
index 7f3623e6af0f092074a8df7dc250fd7b640fe732..495442efac853517891c1efdec54f1f5e8e14e75 100644
--- a/tests/testPeriodicBC.c
+++ b/tests/testPeriodicBC.c
@@ -177,8 +177,7 @@ struct cell *make_cell(size_t n, double *offset, double size, double h,
   shuffle_particles(cell->parts, cell->count);
 
   cell->sorted = 0;
-  for (int k = 0; k < 13; k++)
-    cell->sort[k] = NULL;
+  for (int k = 0; k < 13; k++) cell->sort[k] = NULL;
 
   return cell;
 }
@@ -186,8 +185,7 @@ struct cell *make_cell(size_t n, double *offset, double size, double h,
 void clean_up(struct cell *ci) {
   free(ci->parts);
   for (int k = 0; k < 13; k++)
-    if (ci->sort[k] != NULL)
-      free(ci->sort[k]);
+    if (ci->sort[k] != NULL) free(ci->sort[k]);
   free(ci);
 }
 
diff --git a/tests/testSPHStep.c b/tests/testSPHStep.c
index 3e1f6b961dc82fc949120af53de6664d0413e5ec..e890c7c1a834ec7ca13ed2e8a509b7ea42db28fd 100644
--- a/tests/testSPHStep.c
+++ b/tests/testSPHStep.c
@@ -81,8 +81,7 @@ struct cell *make_cell(size_t N, float cellSize, int offset[3], int id_offset) {
   cell->ti_end_max = 1;
 
   cell->sorted = 0;
-  for (int k = 0; k < 13; k++)
-    cell->sort[k] = NULL;
+  for (int k = 0; k < 13; k++) cell->sort[k] = NULL;
 
   return cell;
 }
@@ -213,8 +212,7 @@ int main() {
     free(cells[j]->parts);
     free(cells[j]->xparts);
     for (int k = 0; k < 13; k++)
-      if (cells[j]->sort[k] != NULL)
-        free(cells[j]->sort[k]);
+      if (cells[j]->sort[k] != NULL) free(cells[j]->sort[k]);
     free(cells[j]);
   }
 
diff --git a/tests/testThreadpool.c b/tests/testThreadpool.c
index bf9e73065fa5b830a0efc58ad7a90aefeb6b0284..6b39991e1620fa90cfea0b7103d6e3e2ce4ed286 100644
--- a/tests/testThreadpool.c
+++ b/tests/testThreadpool.c
@@ -82,7 +82,7 @@ int main(int argc, char *argv[]) {
       threadpool_map(&tp, map_function_first, data, N, sizeof(int), 2, NULL);
     }
 
-    /* If logging was enabled, dump the log. */
+/* If logging was enabled, dump the log. */
 #ifdef SWIFT_DEBUG_THREADPOOL
     char filename[80];
     sprintf(filename, "threadpool_log-%d.txt", num_thread);