diff --git a/examples/main.c b/examples/main.c
index 2833ec3169ea93a99eefe8f126356d5848f9fd13..cd7e4b6b8965c7366622ed58f96455d7ae76a307 100644
--- a/examples/main.c
+++ b/examples/main.c
@@ -265,7 +265,7 @@ int main(int argc, char *argv[]) {
   /* Report CPU frequency. */
   cpufreq = clocks_get_cpufreq();
   if (myrank == 0) {
-    message("Running on: %s",hostname());
+    message("Running on: %s", hostname());
     message("CPU frequency used for tick conversion: %llu Hz", cpufreq);
   }
 
diff --git a/src/engine.c b/src/engine.c
index 0319dfd81fa5c3ebf68b00a04946499326eda261..cee11667f18ed28aff7bbd2e6fd7038c16fbd105 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -2174,15 +2174,18 @@ void engine_print_task_counts(struct engine *e) {
   int counts[task_type_count + 1];
   for (int k = 0; k <= task_type_count; k++) counts[k] = 0;
   for (int k = 0; k < sched->nr_tasks; k++) {
-    if (sched->tasks[k].skip) counts[task_type_count] += 1;
-    else counts[(int)sched->tasks[k].type] += 1;
+    if (sched->tasks[k].skip)
+      counts[task_type_count] += 1;
+    else
+      counts[(int)sched->tasks[k].type] += 1;
   }
 #ifdef WITH_MPI
   printf("[%04i] %s engine_print_task_counts: task counts are [ %s=%i",
          e->nodeID, clocks_get_timesincestart(), taskID_names[0], counts[0]);
 #else
   printf("%s engine_print_task_counts: time step:%d task counts are [ %s=%i",
-         clocks_get_timesincestart(), e->ti_current, taskID_names[0], counts[0]);
+         clocks_get_timesincestart(), e->ti_current, taskID_names[0],
+         counts[0]);
 #endif
   for (int k = 1; k < task_type_count; k++)
     printf(" %s=%i", taskID_names[k], counts[k]);
@@ -2796,7 +2799,7 @@ void engine_step(struct engine *e) {
     mask |= 1 << task_type_recv;
     submask |= 1 << task_subtype_tend;
   }
-  
+
   engine_print_task_counts(e);
 
   if (e->verbose) engine_print_task_counts(e);
@@ -3364,13 +3367,14 @@ void engine_init(struct engine *e, struct space *s,
             nr_nodes * nr_threads);
     e->file_timesteps = fopen(timestepsfileName, "w");
     fprintf(e->file_timesteps,
-            "# Host: %s\n# Branch: %s\n# Revision: %s\n# Compiler: %s, Version: %s \n# "
+            "# Host: %s\n# Branch: %s\n# Revision: %s\n# Compiler: %s, "
+            "Version: %s \n# "
             "Number of threads: %d\n# Number of MPI ranks: %d\n# Hydrodynamic "
             "scheme: %s\n# Hydrodynamic kernel: %s\n# No. of neighbours: %.2f "
             "+/- %.2f\n# Eta: %f\n",
-            hostname(), git_branch(), git_revision(), compiler_name(), compiler_version(),
-            e->nr_threads, e->nr_nodes, SPH_IMPLEMENTATION, kernel_name,
-            e->hydro_properties->target_neighbours,
+            hostname(), git_branch(), git_revision(), compiler_name(),
+            compiler_version(), e->nr_threads, e->nr_nodes, SPH_IMPLEMENTATION,
+            kernel_name, e->hydro_properties->target_neighbours,
             e->hydro_properties->delta_neighbours,
             e->hydro_properties->eta_neighbours);
 
diff --git a/src/version.c b/src/version.c
index 4a5cdebffaf55d83ad1e3b2e1f936f4e2bc50d9b..3d948e593f58a5f6df0ccbcfc536c086a6859aa3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -62,8 +62,7 @@ const char *hostname(void) {
   static int initialised = 0;
   if (!initialised) {
     buf[255] = '\0';
-    if(gethostname(buf,255))
-      sprintf(buf, "%s", "Unknown host");
+    if (gethostname(buf, 255)) sprintf(buf, "%s", "Unknown host");
     initialised = 1;
   }
   return buf;
diff --git a/src/version.h b/src/version.h
index 6be044bf5f36ffa0e121584be3eabc6cfd2793b0..07a98c5e3175efd82110efc0104336d657edd469 100644
--- a/src/version.h
+++ b/src/version.h
@@ -22,7 +22,7 @@
 
 const char* package_description(void);
 const char* package_version(void);
-const char *hostname(void);
+const char* hostname(void);
 const char* git_revision(void);
 const char* git_branch(void);
 const char* compiler_name(void);