diff --git a/src/dagmc/DagMC.cpp b/src/dagmc/DagMC.cpp
index b680d43de1..9a999184ad 100644
--- a/src/dagmc/DagMC.cpp
+++ b/src/dagmc/DagMC.cpp
@@ -261,7 +261,6 @@ ErrorCode DagMC::get_graveyard_group(EntityHandle& graveyard_group) {
 }
 
 ErrorCode DagMC::remove_graveyard() {
-
   if (!has_graveyard()) return MB_SUCCESS;
 
   ErrorCode rval;
@@ -412,7 +411,8 @@ ErrorCode DagMC::create_graveyard(bool overwrite) {
       // get the bounding box of the volume
       moab::EntityHandle surf = this->entity_by_index(2, i + 1);
       moab::Range vertices;
-      rval = this->moab_instance()->get_entities_by_type(surf, moab::MBVERTEX, vertices);
+      rval = this->moab_instance()->get_entities_by_type(surf, moab::MBVERTEX,
+                                                         vertices);
       MB_CHK_SET_ERR(rval, "Failed to get surface vertices");
       double coords[3];
       for (auto vertex : vertices) {
@@ -422,8 +422,8 @@ ErrorCode DagMC::create_graveyard(bool overwrite) {
         box.update(coords);
       }
     }
-  // if there acceleration data structures exist, use those for
-  // a faster bounding box build
+    // if there acceleration data structures exist, use those for
+    // a faster bounding box build
   } else {
     for (int i = 0; i < num_entities(3); i++) {
       // get the bounding box of the volume
@@ -500,7 +500,8 @@ ErrorCode DagMC::create_graveyard(bool overwrite) {
     rval = setup_impl_compl();
     MB_CHK_SET_ERR(rval, "Failed to create the implicit complement.");
     rval = geom_tool()->get_implicit_complement(implicit_complement);
-    MB_CHK_SET_ERR(rval, "Failed to get implicit complement right after creation");
+    MB_CHK_SET_ERR(rval,
+                   "Failed to get implicit complement right after creation");
   }
 
   EntityHandle inner_surface;
@@ -543,7 +544,8 @@ ErrorCode DagMC::create_graveyard(bool overwrite) {
                  "Failed to create the graveyard parent-child relationship");
 
   // set the surface senses (all triangles have outward normals so this should
-  // be FORWARD wrt the graveyard volume and REVERSE wrt the implicit complement)
+  // be FORWARD wrt the graveyard volume and REVERSE wrt the implicit
+  // complement)
   EntityHandle outer_senses[2] = {volume_set, implicit_complement};
   rval = MBI->tag_set_data(sense_tag(), &outer_surface, 1, outer_senses);
   MB_CHK_SET_ERR(rval, "Failed to set graveyard surface senses");
@@ -568,9 +570,9 @@ ErrorCode DagMC::create_graveyard(bool overwrite) {
         "Failed to build accel. data structure for the new graveyard volume");
     // re-build the BVH for the implicit complement
     rval = build_bvh(implicit_complement);
-    MB_CHK_SET_ERR(
-        rval,
-        "Failed to build accel. data structure for the new implicit complement");
+    MB_CHK_SET_ERR(rval,
+                   "Failed to build accel. data structure for the new implicit "
+                   "complement");
   }
 
   // re-initialize indices
diff --git a/src/dagmc/DagMC.hpp b/src/dagmc/DagMC.hpp
index 7dd1e5b75c..bad1e37436 100644
--- a/src/dagmc/DagMC.hpp
+++ b/src/dagmc/DagMC.hpp
@@ -75,11 +75,10 @@ class DagMC {
   DagMC(std::shared_ptr<Interface> mb_impl = nullptr,
         double overlap_tolerance = 0., double numerical_precision = .001);
   // Deprecated Constructor
-  [
-      [deprecated("Replaced by DagMC(std::shared_ptr<Interface> mb_impl, ... "
-                  ")")]] DagMC(Interface* mb_impl,
-                               double overlap_tolerance = 0.,
-                               double numerical_precision = .001);
+  [[deprecated(
+      "Replaced by DagMC(std::shared_ptr<Interface> mb_impl, ... "
+      ")")]] DagMC(Interface* mb_impl, double overlap_tolerance = 0.,
+                   double numerical_precision = .001);
   // Destructor
   ~DagMC();
 
diff --git a/src/tally/CellTally.cpp b/src/tally/CellTally.cpp
index f89c98ce51..53f52b4b0e 100644
--- a/src/tally/CellTally.cpp
+++ b/src/tally/CellTally.cpp
@@ -52,9 +52,9 @@ void CellTally::write_data(double num_histories) {
 
   std::cout << "cell id = " << cell_id << std::endl;
   std::cout << "type = "
-            << (expected_type == TallyEvent::COLLISION
-                    ? "collision "
-                    : expected_type == TallyEvent::TRACK ? "track " : "none");
+            << (expected_type == TallyEvent::COLLISION ? "collision "
+                : expected_type == TallyEvent::TRACK   ? "track "
+                                                       : "none");
   std::cout << std::endl;
 
   std::cout << "volume = " << cell_volume << std::endl << std::endl;