diff --git a/include/openmc/particle_data.h b/include/openmc/particle_data.h
index 5a2118ce43..1df2b3ef19 100644
--- a/include/openmc/particle_data.h
+++ b/include/openmc/particle_data.h
@@ -377,75 +377,25 @@ public:
 
 #ifdef OPENMC_DAGMC_ENABLED
   // DagMC state variables
-  moab::DagMC::RayHistory& history()
-  {
-    return history_;
-  }
-  Direction& last_dir()
-  {
-    return last_dir_;
-  }
+  moab::DagMC::RayHistory& history() { return history_; }
+  Direction& last_dir() { return last_dir_; }
 #endif
 
   // material of current and last cell
-  int& material()
-  {
-    return material_;
-  }
-  const int& material() const
-  {
-    return material_;
-  }
-  int& material_last()
-  {
-    return material_last_;
-  }
-  const int& material_last() const
-  {
-    return material_last_;
-  }
+  int& material() { return material_; }
+  const int& material() const { return material_; }
+  int& material_last() { return material_last_; }
+  const int& material_last() const { return material_last_; }
 
   // temperature of current and last cell
-  double& sqrtkT()
-  {
-    return sqrtkT_;
-  }
-  const double& sqrtkT() const
-  {
-    return sqrtkT_;
-  }
-  double& sqrtkT_last()
-  {
-    return sqrtkT_last_;
-  }
+  double& sqrtkT() { return sqrtkT_; }
+  const double& sqrtkT() const { return sqrtkT_; }
+  double& sqrtkT_last() { return sqrtkT_last_; }
 
   // density multiplier of the current and last cell
-  double& density_mult()
-  {
-    return density_mult_;
-  }
-  const double& density_mult() const
-  {
-    return density_mult_;
-  }
-  double& density_mult_last()
-  {
-    return density_mult_last_;
-  }
-
-  // density multiplier of the current and last cell
-  double& density_mult()
-  {
-    return density_mult_;
-  }
-  const double& density_mult() const
-  {
-    return density_mult_;
-  }
-  double& density_mult_last()
-  {
-    return density_mult_last_;
-  }
+  double& density_mult() { return density_mult_; }
+  const double& density_mult() const { return density_mult_; }
+  double& density_mult_last() { return density_mult_last_; }
 
 private:
   int64_t id_ {-1}; //!< Unique ID
diff --git a/src/surface.cpp b/src/surface.cpp
index 419859efae..0621bda84c 100644
--- a/src/surface.cpp
+++ b/src/surface.cpp
@@ -1316,7 +1316,7 @@ void read_surfaces(pugi::xml_node node)
     pugi::xml_node surf_node;
     int i_surf;
     for (surf_node = node.child("surface"), i_surf = 0; surf_node;
-         surf_node = surf_node.next_sibling("surface"), i_surf++) {
+      surf_node = surf_node.next_sibling("surface"), i_surf++) {
       std::string surf_type = get_node_value(surf_node, "type", true, true);
 
       // Allocate and initialize the new surface