diff --git a/examples/main.c b/examples/main.c
index e3a4e39e8ab0d3f54618be6ecf07ff1c6b30a27e..8771a59031ce9608f6617331a48ae3424a589eeb 100644
--- a/examples/main.c
+++ b/examples/main.c
@@ -1152,7 +1152,7 @@ int main(int argc, char *argv[]) {
       task_dump_stats(dumpfile, &e, /* header = */ 0, /* allranks = */ 1);
     }
 
-      /* Dump memory use report if collected. */
+    /* Dump memory use report if collected. */
 #ifdef SWIFT_MEMUSE_REPORTS
     {
       char dumpfile[40];
@@ -1216,11 +1216,9 @@ int main(int argc, char *argv[]) {
 
     /* Print information to the SFH logger */
     if (e.policy & engine_policy_star_formation) {
-      star_formation_logger_write_to_log_file(e.sfh_logger, e.time,
-                                              e.cosmology->a, e.cosmology->z,
-                                              e.sfh, e.step);
+      star_formation_logger_write_to_log_file(
+          e.sfh_logger, e.time, e.cosmology->a, e.cosmology->z, e.sfh, e.step);
     }
-
   }
 
   /* Write final output. */
diff --git a/src/cell.c b/src/cell.c
index 9e05d555c7fc500e31e12fca8c568a2e3a47d600..716869c28e60fdffd755d87e62f024528a0327c9 100644
--- a/src/cell.c
+++ b/src/cell.c
@@ -4945,8 +4945,8 @@ struct spart *cell_add_spart(struct engine *e, struct cell *const c) {
       }
     }
 
-      /* Check that the cell was indeed drifted to this point to avoid future
-       * issues */
+    /* Check that the cell was indeed drifted to this point to avoid future
+     * issues */
 #ifdef SWIFT_DEBUG_CHECKS
     if (top->hydro.super != NULL && top->stars.count > 0 &&
         top->stars.ti_old_part != e->ti_current) {
diff --git a/src/engine.c b/src/engine.c
index 59b509bb6b994e7707b4489f9021e47b8175ff1f..f0b6c1ae0ea5d61865f9ea1585afd9029812b0dd 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -2716,7 +2716,7 @@ void engine_collect_end_of_step_recurse_hydro(struct cell *c,
       inhibited += cp->hydro.inhibited;
 
       /* Check if the cell is inactive and in that case reorder the SFH */
-      if (!cell_is_starting_hydro(cp,e)){ 
+      if (!cell_is_starting_hydro(cp, e)) {
         star_formation_logger_log_inactive_cell(&cp->stars.sfh);
       }
 
@@ -3016,7 +3016,7 @@ void engine_collect_end_of_step_mapper(void *map_data, int num_elements,
       b_inhibited += c->black_holes.inhibited;
 
       /* Check if the cell is inactive and in that case reorder the SFH */
-      if (!cell_is_starting_hydro(c,e)){ 
+      if (!cell_is_starting_hydro(c, e)) {
         star_formation_logger_log_inactive_cell(&c->stars.sfh);
       }
 
@@ -3951,7 +3951,7 @@ void engine_check_for_dumps(struct engine *e) {
 #endif
         }
 
-          /* Dump... */
+        /* Dump... */
 #ifdef WITH_LOGGER
         /* Write a file containing the offsets in the particle logger. */
         engine_dump_index(e);
@@ -6035,7 +6035,7 @@ void engine_clean(struct engine *e) {
   scheduler_clean(&e->sched);
   space_clean(e->s);
   threadpool_clean(&e->threadpool);
-  
+
   /* Close files */
   fclose(e->file_timesteps);
   fclose(e->file_stats);
diff --git a/src/runner.c b/src/runner.c
index cc3b937ff6522dcbefede269190c81ae7c92ab69..647e3db0e9dd19323340435d6dcb7c74034d514e 100644
--- a/src/runner.c
+++ b/src/runner.c
@@ -685,7 +685,6 @@ void runner_do_star_formation(struct runner *r, struct cell *c, int timer) {
             /* Convert the gas particle to a star particle */
             struct spart *sp = cell_convert_part_to_spart(e, c, p, xp);
 
-
             /* Did we get a star? (Or did we run out of spare ones?) */
             if (sp != NULL) {
 
@@ -1608,10 +1607,10 @@ void runner_do_ghost(struct runner *r, struct cell *c, int timer) {
           if (((p->h >= hydro_h_max) && (f < 0.f)) ||
               ((p->h <= hydro_h_min) && (f > 0.f))) {
 
-          /* We have a particle whose smoothing length is already set (wants
-           * to be larger but has already hit the maximum OR wants to be
-           * smaller but has already reached the minimum). So, just tidy up as
-           * if the smoothing length had converged correctly  */
+            /* We have a particle whose smoothing length is already set (wants
+             * to be larger but has already hit the maximum OR wants to be
+             * smaller but has already reached the minimum). So, just tidy up as
+             * if the smoothing length had converged correctly  */
 
 #ifdef EXTRA_HYDRO_LOOP