diff --git a/src/openturbine.hpp b/src/openturbine.hpp
index 73504864..e5479045 100644
--- a/src/openturbine.hpp
+++ b/src/openturbine.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "types.hpp"
 #include "beams/beams.hpp"
 #include "constraints/constraints.hpp"
 #include "solver/solver.hpp"
 #include "state/state.hpp"
 #include "step/step.hpp"
 #include "step/step_parameters.hpp"
+#include "types.hpp"
diff --git a/src/step/assemble_constraints_matrix.cpp b/src/step/assemble_constraints_matrix.cpp
index b1ebde0e..1e13dd96 100644
--- a/src/step/assemble_constraints_matrix.cpp
+++ b/src/step/assemble_constraints_matrix.cpp
@@ -24,7 +24,8 @@ void AssembleConstraintsMatrix(Solver& solver, const Constraints& constraints) {
             CopyConstraintsToSparseMatrix<Solver::CrsMatrixType>{
                 constraints.row_range, constraints.base_node_col_range,
                 constraints.target_node_col_range, solver.B, constraints.base_gradient_terms,
-                constraints.target_gradient_terms}
+                constraints.target_gradient_terms
+            }
         );
     }
 
diff --git a/src/step/assemble_constraints_residual.cpp b/src/step/assemble_constraints_residual.cpp
index 5dd578ea..54b5f71d 100644
--- a/src/step/assemble_constraints_residual.cpp
+++ b/src/step/assemble_constraints_residual.cpp
@@ -18,7 +18,8 @@ void AssembleConstraintsResidual(const Solver& solver, const Constraints& constr
     Kokkos::parallel_for(
         "ContributeConstraintsSystemResidualToVector", constraints.num,
         ContributeConstraintsSystemResidualToVector{
-            constraints.target_node_index, solver.R, constraints.system_residual_terms}
+            constraints.target_node_index, solver.R, constraints.system_residual_terms
+        }
     );
 
     auto R = Solver::ValuesType(
@@ -42,7 +43,8 @@ void AssembleConstraintsResidual(const Solver& solver, const Constraints& constr
         CopyConstraintsResidualToVector{
             constraints.row_range,
             Kokkos::subview(solver.R, Kokkos::make_pair(solver.num_system_dofs, solver.num_dofs)),
-            constraints.residual_terms}
+            constraints.residual_terms
+        }
     );
 }
 
diff --git a/src/step/assemble_inertia_matrix.cpp b/src/step/assemble_inertia_matrix.cpp
index 06d61d77..0a353541 100644
--- a/src/step/assemble_inertia_matrix.cpp
+++ b/src/step/assemble_inertia_matrix.cpp
@@ -18,7 +18,8 @@ void AssembleInertiaMatrix(const Beams& beams, double beta_prime, double gamma_p
         IntegrateInertiaMatrix{
             beams.num_nodes_per_element, beams.num_qps_per_element, beams.qp_weight,
             beams.qp_jacobian, beams.shape_interp, beams.qp_Muu, beams.qp_Guu, beta_prime,
-            gamma_prime, beams.inertia_matrix_terms}
+            gamma_prime, beams.inertia_matrix_terms
+        }
     );
 }
 
diff --git a/src/step/assemble_residual_vector.cpp b/src/step/assemble_residual_vector.cpp
index f1364a8f..01af88d4 100644
--- a/src/step/assemble_residual_vector.cpp
+++ b/src/step/assemble_residual_vector.cpp
@@ -23,7 +23,8 @@ void AssembleResidualVector(const Beams& beams) {
         IntegrateResidualVector{
             beams.num_nodes_per_element, beams.num_qps_per_element, beams.qp_weight,
             beams.qp_jacobian, beams.shape_interp, beams.shape_deriv, beams.node_FX, beams.qp_Fc,
-            beams.qp_Fd, beams.qp_Fi, beams.qp_Fe, beams.qp_Fg, beams.residual_vector_terms}
+            beams.qp_Fd, beams.qp_Fi, beams.qp_Fe, beams.qp_Fg, beams.residual_vector_terms
+        }
     );
 }
 
diff --git a/src/step/assemble_system_matrix.cpp b/src/step/assemble_system_matrix.cpp
index f33846d2..c7608845 100644
--- a/src/step/assemble_system_matrix.cpp
+++ b/src/step/assemble_system_matrix.cpp
@@ -30,7 +30,8 @@ void AssembleSystemMatrix(Solver& solver, const Beams& beams) {
     Kokkos::parallel_for(
         "ContributeElementsToSparseMatrix", sparse_matrix_policy,
         ContributeElementsToSparseMatrix<Solver::CrsMatrixType>{
-            solver.K, beams.stiffness_matrix_terms}
+            solver.K, beams.stiffness_matrix_terms
+        }
     );
 
     Kokkos::fence();
diff --git a/src/step/assemble_system_residual.cpp b/src/step/assemble_system_residual.cpp
index 2aa4391e..f4687445 100644
--- a/src/step/assemble_system_residual.cpp
+++ b/src/step/assemble_system_residual.cpp
@@ -18,7 +18,8 @@ void AssembleSystemResidual(const Solver& solver, const Beams& beams) {
         "ContributeElementsToVector", vector_policy,
         ContributeElementsToVector{
             beams.num_nodes_per_element, beams.node_state_indices, beams.residual_vector_terms,
-            solver.R}
+            solver.R
+        }
     );
 }
 
diff --git a/src/step/update_constraint_variables.cpp b/src/step/update_constraint_variables.cpp
index 5b6d9908..35b062a8 100644
--- a/src/step/update_constraint_variables.cpp
+++ b/src/step/update_constraint_variables.cpp
@@ -21,7 +21,8 @@ void UpdateConstraintVariables(const State& state, Constraints& constraints) {
         "CalculateConstraintForce", constraints.num,
         CalculateConstraintForce{
             constraints.type, constraints.target_node_index, constraints.axes, constraints.input,
-            state.q, constraints.system_residual_terms}
+            state.q, constraints.system_residual_terms
+        }
     );
 
     Kokkos::parallel_for(
@@ -29,7 +30,8 @@ void UpdateConstraintVariables(const State& state, Constraints& constraints) {
         CalculateConstraintResidualGradient{
             constraints.type, constraints.base_node_index, constraints.target_node_index,
             constraints.X0, constraints.axes, constraints.input, state.q, constraints.residual_terms,
-            constraints.base_gradient_terms, constraints.target_gradient_terms}
+            constraints.base_gradient_terms, constraints.target_gradient_terms
+        }
     );
 }
 
diff --git a/src/step/update_system_variables.cpp b/src/step/update_system_variables.cpp
index 5953fd52..975bd750 100644
--- a/src/step/update_system_variables.cpp
+++ b/src/step/update_system_variables.cpp
@@ -39,7 +39,8 @@ void UpdateSystemVariables(
             beams.num_nodes_per_element, beams.num_qps_per_element, beams.shape_interp,
             beams.shape_deriv, beams.qp_jacobian, beams.node_u, beams.node_u_dot, beams.node_u_ddot,
             beams.qp_x0, beams.qp_r0, beams.qp_u, beams.qp_u_prime, beams.qp_r, beams.qp_r_prime,
-            beams.qp_u_dot, beams.qp_omega, beams.qp_u_ddot, beams.qp_omega_dot, beams.qp_x}
+            beams.qp_u_dot, beams.qp_omega, beams.qp_u_ddot, beams.qp_omega_dot, beams.qp_x
+        }
     );
 
     Kokkos::parallel_for(
@@ -81,7 +82,8 @@ void UpdateSystemVariables(
             beams.qp_Puu,
             beams.qp_Quu,
             beams.qp_Guu,
-            beams.qp_Kuu}
+            beams.qp_Kuu
+        }
     );
 
     AssembleResidualVector(beams);