diff --git a/src/synergia/simulation/step.cc b/src/synergia/simulation/step.cc
index 5f47339f0..249449d26 100644
--- a/src/synergia/simulation/step.cc
+++ b/src/synergia/simulation/step.cc
@@ -4,27 +4,30 @@
 #include "synergia/foundation/physical_constants.h"
 
 namespace {
-  void
-  apply_longitudinal_boundary(Bunch& bunch)
-  {
-    // Bunch longitudinal boundary condition
-    auto lb = bunch.get_longitudinal_boundary();
-
-    switch (lb.first) {
-      case LongitudinalBoundary::periodic:
-        apply_longitudinal_periodicity(bunch, lb.second);
-        break;
-
-      case LongitudinalBoundary::aperture: apply_zcut(bunch, lb.second); break;
-
-      case LongitudinalBoundary::bucket_barrier:
-        apply_longitudinal_bucket_barrier(bunch, lb.second);
-        break;
-
-      case LongitudinalBoundary::open:
-      default: break;
+    void
+    apply_longitudinal_boundary(Bunch& bunch)
+    {
+        // Bunch longitudinal boundary condition
+        auto lb = bunch.get_longitudinal_boundary();
+
+        switch (lb.first) {
+            case LongitudinalBoundary::periodic:
+                apply_longitudinal_periodicity(bunch, lb.second);
+                break;
+
+            case LongitudinalBoundary::aperture:
+                apply_zcut(bunch, lb.second);
+                break;
+
+            case LongitudinalBoundary::bucket_barrier:
+                apply_longitudinal_bucket_barrier(bunch, lb.second);
+                break;
+
+            case LongitudinalBoundary::open:
+            default:
+                break;
+        }
     }
-  }
 }
 
 Step::Step(double length) : operators(), step_betas(), length(length) {}
@@ -32,43 +35,45 @@ Step::Step(double length) : operators(), step_betas(), length(length) {}
 void
 Step::create_operations(Lattice const& lattice)
 {
-  for (auto& op : operators) { op->create_operations(lattice); }
+    for (auto& op : operators) {
+        op->create_operations(lattice);
+    }
 }
 
 void
 Step::apply(Bunch_simulator& simulator, Logger& logger) const
 {
-  if (simulator[0].get_bunch_array_size() == 0) {
-    throw std::runtime_error(
-      "Step::apply() unable to proceed. no bunch in the simulator");
-  }
+    if (simulator[0].get_bunch_array_size() == 0) {
+        throw std::runtime_error(
+            "Step::apply() unable to proceed. no bunch in the simulator");
+    }
 
-  // time [s] in accelerator frame
-  double ref_beta = simulator[0][0].get_reference_particle().get_beta();
-  double time = length / (ref_beta * pconstants::c);
+    // time [s] in accelerator frame
+    double ref_beta = simulator[0][0].get_reference_particle().get_beta();
+    double time = length / (ref_beta * pconstants::c);
 
-  for (auto const& op : operators) {
-    double t0 = MPI_Wtime();
+    for (auto const& op : operators) {
+        double t0 = MPI_Wtime();
 
-    logger(LoggerV::INFO_OPR) << "\n  Operator start:\n";
+        logger(LoggerV::INFO_OPR) << "\n  Operator start:\n";
 
-    // operator apply
-    op->apply(simulator, time, logger);
+        // operator apply
+        op->apply(simulator, time, logger);
 
-    double t1 = MPI_Wtime();
+        double t1 = MPI_Wtime();
 
-    logger(LoggerV::INFO_OPR)
-      << "  Operator finish: operator: name = " << op->get_name()
-      << ", type = " << op->get_type() << ", time = " << std::fixed
-      << std::setprecision(3) << t1 - t0 << "s"
-      << "\n";
+        logger(LoggerV::INFO_OPR)
+            << "  Operator finish: operator: name = " << op->get_name()
+            << ", type = " << op->get_type() << ", time = " << std::fixed
+            << std::setprecision(3) << t1 - t0 << "s"
+            << "\n";
 
-    // per operator diagnostics action
-    simulator.diag_action_operator(*op);
+        // per operator diagnostics action
+        simulator.diag_action_operator(*op);
 
-    // longitudinal conditions
-    for (auto& train : simulator.get_trains())
-      for (auto& bunch : train.get_bunches())
-        apply_longitudinal_boundary(bunch);
-  }
+        // longitudinal conditions
+        for (auto& train : simulator.get_trains())
+            for (auto& bunch : train.get_bunches())
+                apply_longitudinal_boundary(bunch);
+    }
 }