diff --git a/include/master_element/Hex8FEM.h b/include/master_element/Hex8FEM.h
index 0b9263c780..e7c0b58315 100644
--- a/include/master_element/Hex8FEM.h
+++ b/include/master_element/Hex8FEM.h
@@ -84,7 +84,7 @@ class Hex8FEM : public MasterElement
                                     +glIP, +glIP, +glIP, -glIP, +glIP, +glIP};
 
   // standard integration location +/ sqrt(3)/3
-  const double gIP = 0.577350269189626; //std::sqrt(3.0) / 3.0;
+  const double gIP = 0.577350269189626; // std::sqrt(3.0) / 3.0;
   const double intgLoc_[numIntPoints_ * nDim_] = {
     -gIP, -gIP, -gIP, +gIP, -gIP, -gIP, +gIP, +gIP, -gIP, -gIP, +gIP, -gIP,
     -gIP, -gIP, +gIP, +gIP, -gIP, +gIP, +gIP, +gIP, +gIP, -gIP, +gIP, +gIP};
diff --git a/include/master_element/MasterElement.h b/include/master_element/MasterElement.h
index 9298f8fe39..21770a13d9 100644
--- a/include/master_element/MasterElement.h
+++ b/include/master_element/MasterElement.h
@@ -104,7 +104,8 @@ class MasterElement
     SharedMemView<DoubleType***, DeviceShmem>& /* deriv */,
     SharedMemView<DoubleType*, DeviceShmem>& /*det_j*/)
   {
-    STK_NGP_ThrowErrorMsg("MasterElement::grad_op_fem not implemented for element");
+    STK_NGP_ThrowErrorMsg(
+      "MasterElement::grad_op_fem not implemented for element");
   }
 
   KOKKOS_FUNCTION virtual void shifted_grad_op_fem(
@@ -121,8 +122,9 @@ class MasterElement
     const SharedMemView<DoubleType**, DeviceShmem>& /* coords */,
     SharedMemView<DoubleType**, DeviceShmem>& /* areav */)
   {
-    STK_NGP_ThrowErrorMsg("MasterElement::determinant not implemented for element: "
-                      "DoubleType area");
+    STK_NGP_ThrowErrorMsg(
+      "MasterElement::determinant not implemented for element: "
+      "DoubleType area");
   }
 
   virtual void determinant(
@@ -154,8 +156,9 @@ class MasterElement
     const SharedMemView<DoubleType**, DeviceShmem>& /* coords */,
     SharedMemView<DoubleType*, DeviceShmem>& /* volume */)
   {
-    STK_NGP_ThrowErrorMsg("MasterElement::determinant not implemented for element: "
-                      "DoubleType volume");
+    STK_NGP_ThrowErrorMsg(
+      "MasterElement::determinant not implemented for element: "
+      "DoubleType volume");
   }
 
   virtual void determinant(
@@ -306,11 +309,13 @@ class MasterElement
   KOKKOS_FUNCTION virtual void
   shape_fcn(SharedMemView<DoubleType**, DeviceShmem>&)
   {
-    STK_NGP_ThrowErrorMsg("MasterElement::shape_fcn not implemented for element");
+    STK_NGP_ThrowErrorMsg(
+      "MasterElement::shape_fcn not implemented for element");
   }
   virtual void shape_fcn(SharedMemView<double**, HostShmem>&)
   {
-    STK_NGP_ThrowErrorMsg("MasterElement::shape_fcn not implemented for element");
+    STK_NGP_ThrowErrorMsg(
+      "MasterElement::shape_fcn not implemented for element");
   }
 
   KOKKOS_FUNCTION virtual void
diff --git a/include/master_element/MasterElementFunctions.h b/include/master_element/MasterElementFunctions.h
index 26e97cbcac..66840e784b 100644
--- a/include/master_element/MasterElementFunctions.h
+++ b/include/master_element/MasterElementFunctions.h
@@ -82,7 +82,8 @@ generic_grad_op(
     CoordViewType::rank == 2, "Coordinate view assumed to be rank 2");
   static_assert(OutputViewType::rank == 3, "Weight view assumed to be rank 3");
 
-  STK_ThrowAssert(AlgTraits::nodesPerElement_ == referenceGradWeights.extent(1));
+  STK_ThrowAssert(
+    AlgTraits::nodesPerElement_ == referenceGradWeights.extent(1));
   STK_ThrowAssert(AlgTraits::nDim_ == referenceGradWeights.extent(2));
   for (int i = 0; i < dim; ++i)
     STK_ThrowAssert(weights.extent(i) == referenceGradWeights.extent(i));
@@ -598,7 +599,8 @@ generic_determinant_3d(
   static_assert(OutputViewType::rank == 1, "Weight view assumed to be 1D");
   static_assert(AlgTraits::nDim_ == 3, "3D method");
 
-  STK_ThrowAssert(AlgTraits::nodesPerElement_ == referenceGradWeights.extent(1));
+  STK_ThrowAssert(
+    AlgTraits::nodesPerElement_ == referenceGradWeights.extent(1));
   STK_ThrowAssert(AlgTraits::nDim_ == referenceGradWeights.extent(2));
 
   STK_ThrowAssert(detj.extent(0) == referenceGradWeights.extent(0));
diff --git a/include/matrix_free/PolynomialOrders.h b/include/matrix_free/PolynomialOrders.h
index 140f8a6e89..9abc85e513 100644
--- a/include/matrix_free/PolynomialOrders.h
+++ b/include/matrix_free/PolynomialOrders.h
@@ -56,27 +56,27 @@ enum {
 #define P_INVOKEABLE(func)                                                     \
   template <int p, typename... Args>                                           \
   auto func(Args&&... args)                                                    \
-    ->decltype(IMPLNAME(func) < p > ::invoke(std::forward<Args>(args)...))     \
+    -> decltype(IMPLNAME(func) < p > ::invoke(std::forward<Args>(args)...))    \
   {                                                                            \
     return IMPLNAME(func)<p>::invoke(std::forward<Args>(args)...);             \
   }
 
 // can't return a value dependent on template parameter
-#define SWITCH_INVOKEABLE(func)                                                   \
-  template <typename... Args>                                                     \
-  auto func(int p, Args&&... args)                                                \
-    ->decltype(IMPLNAME(func) < inst::P1 > ::invoke(std::forward<Args>(args)...)) \
-  {                                                                               \
-    switch (p) {                                                                  \
-    case inst::P2:                                                                \
-      return IMPLNAME(func)<inst::P2>::invoke(std::forward<Args>(args)...);       \
-    case inst::P3:                                                                \
-      return IMPLNAME(func)<inst::P3>::invoke(std::forward<Args>(args)...);       \
-    case inst::P4:                                                                \
-      return IMPLNAME(func)<inst::P4>::invoke(std::forward<Args>(args)...);       \
-    default:                                                                      \
-      return IMPLNAME(func)<inst::P1>::invoke(std::forward<Args>(args)...);       \
-    }                                                                             \
+#define SWITCH_INVOKEABLE(func)                                                    \
+  template <typename... Args>                                                      \
+  auto func(int p, Args&&... args)                                                 \
+    -> decltype(IMPLNAME(func) < inst::P1 > ::invoke(std::forward<Args>(args)...)) \
+  {                                                                                \
+    switch (p) {                                                                   \
+    case inst::P2:                                                                 \
+      return IMPLNAME(func)<inst::P2>::invoke(std::forward<Args>(args)...);        \
+    case inst::P3:                                                                 \
+      return IMPLNAME(func)<inst::P3>::invoke(std::forward<Args>(args)...);        \
+    case inst::P4:                                                                 \
+      return IMPLNAME(func)<inst::P4>::invoke(std::forward<Args>(args)...);        \
+    default:                                                                       \
+      return IMPLNAME(func)<inst::P1>::invoke(std::forward<Args>(args)...);        \
+    }                                                                              \
   }
 
 } // namespace matrix_free
diff --git a/include/utils/AMSUtils.h b/include/utils/AMSUtils.h
index 3b5628a9c5..603d8a66d5 100644
--- a/include/utils/AMSUtils.h
+++ b/include/utils/AMSUtils.h
@@ -21,7 +21,8 @@ template <class T, int dim = 3>
 KOKKOS_FUNCTION T
 get_M43_constant(T D[dim][dim], const double CMdeg)
 {
-  STK_NGP_ThrowRequireMsg(dim == 3, "Compute of M43 constant requires 3D problem");
+  STK_NGP_ThrowRequireMsg(
+    dim == 3, "Compute of M43 constant requires 3D problem");
 
   // Coefficients for the polynomial
   double c[15] = {0.971903113666644,  0.065591700544879,  0.071103489538998,