diff --git a/examples/main.c b/examples/main.c
index 42abab62409b2ce61a5bd12bc745d63a62cb79b9..716a3922a022f2d05c447f554444f9e4a277c073 100644
--- a/examples/main.c
+++ b/examples/main.c
@@ -605,12 +605,12 @@ int main(int argc, char *argv[]) {
   struct external_potential potential;
   if (with_external_gravity)
     potential_init(params, &prog_const, &us, &s, &potential);
-  if (with_external_gravity && myrank == 0) potential_print(&potential);
+  if (myrank == 0) potential_print(&potential);
 
   /* Initialise the cooling function properties */
   struct cooling_function_data cooling_func;
   if (with_cooling) cooling_init(params, &us, &prog_const, &cooling_func);
-  if (with_cooling && myrank == 0) cooling_print(&cooling_func);
+  if (myrank == 0) cooling_print(&cooling_func);
 
   /* Initialise the chemistry */
   struct chemistry_data chemistry;
diff --git a/src/hydro/Gizmo/hydro_gradients.h b/src/hydro/Gizmo/hydro_gradients.h
index 8513308cc9c5de6bac489e79786fddc8af7e4258..46cafcc31ef80cef468a915fdfdaf9b1625807ab 100644
--- a/src/hydro/Gizmo/hydro_gradients.h
+++ b/src/hydro/Gizmo/hydro_gradients.h
@@ -159,4 +159,4 @@ __attribute__((always_inline)) INLINE static void hydro_gradients_predict(
   gizmo_check_physical_quantity("pressure", Wj[4]);
 }
 
-#endif  /* SWIFT_HYDRO_GIZMO_GRADIENTS_H */
+#endif /* SWIFT_HYDRO_GIZMO_GRADIENTS_H */
diff --git a/src/hydro/Gizmo/hydro_slope_limiters.h b/src/hydro/Gizmo/hydro_slope_limiters.h
index acf3364a054ff66933c5a8c674abf820fb519913..78f2785cdae5dc2334d37e3924dd5b259cca8c05 100644
--- a/src/hydro/Gizmo/hydro_slope_limiters.h
+++ b/src/hydro/Gizmo/hydro_slope_limiters.h
@@ -91,4 +91,4 @@ __attribute__((always_inline)) INLINE static void hydro_slope_limit_cell(
 
 #endif
 
-#endif  /* SWIFT_HYDRO_SLOPE_LIMITERS_H */
+#endif /* SWIFT_HYDRO_SLOPE_LIMITERS_H */
diff --git a/src/hydro/Gizmo/hydro_unphysical.h b/src/hydro/Gizmo/hydro_unphysical.h
index 1a8bf334f8b6409bd757271812d4d7dc4e297a45..f1e64a281c13a4e31eb8871139d8f28c95c26928 100644
--- a/src/hydro/Gizmo/hydro_unphysical.h
+++ b/src/hydro/Gizmo/hydro_unphysical.h
@@ -52,4 +52,4 @@
 
 #endif  // defined(GIZMO_UNPHYSICAL_ERROR) || defined(GIZMO_UNPHYSICAL_RESCUE)
 
-#endif  /* SWIFT_HYDRO_UNPHYSICAL_H */
+#endif /* SWIFT_HYDRO_UNPHYSICAL_H */
diff --git a/src/hydro/Gizmo/hydro_velocities.h b/src/hydro/Gizmo/hydro_velocities.h
index 549d8eac3485efb9aa0b2a5ddae03b8c00fe0f8a..2f7bc0d54d6130c253f72be34463078a8931725d 100644
--- a/src/hydro/Gizmo/hydro_velocities.h
+++ b/src/hydro/Gizmo/hydro_velocities.h
@@ -152,4 +152,4 @@ __attribute__((always_inline)) INLINE static void hydro_velocities_set(
   }
 }
 
-#endif  /* SWIFT_HYDRO_VELOCITIES_H */
+#endif /* SWIFT_HYDRO_VELOCITIES_H */