diff --git a/include/openmc/distribution_spatial.h b/include/openmc/distribution_spatial.h
index 6d771fd6bc..0be6329f55 100644
--- a/include/openmc/distribution_spatial.h
+++ b/include/openmc/distribution_spatial.h
@@ -108,14 +108,17 @@ public:
   //! \return Sampled position
   Position sample(uint64_t* seed) const;
 
+  const unique_ptr<Mesh>& mesh() const { return model::meshes.at(mesh_idx_); }
+
+  int32_t n_sources() const { return this->mesh()->n_bins(); }
+
 private:
-  Mesh* mesh_ptr_;
-  int32_t mesh_idx_;
+  Mesh* mesh_ptr_ {nullptr};
+  int32_t mesh_idx_ {C_NONE};
   std::string sample_scheme_;
-  double total_strength_;
+  double total_strength_ {0.0};
   std::vector<double> mesh_CDF_;
   std::vector<double> mesh_strengths_;
-  int32_t tot_bins_;
 };
 
 //==============================================================================
diff --git a/src/distribution_spatial.cpp b/src/distribution_spatial.cpp
index a0cfec2f03..7418b483a5 100644
--- a/src/distribution_spatial.cpp
+++ b/src/distribution_spatial.cpp
@@ -198,21 +198,18 @@ MeshSpatial::MeshSpatial(pugi::xml_node node)
   mesh_ptr_ = dynamic_cast<Mesh*>(model::meshes[mesh_idx_].get());
   if (!mesh_ptr_) {fatal_error("Mesh passed to spatial distribution is not a mesh object"); }
 
-  // Initialize arrays for CDF creation
-  tot_bins_ = mesh_ptr_->n_bins();
-  std::vector<double> strengths = {};
-  strengths.resize(tot_bins_);
-  double temp_total_strength = 0.0;
-  mesh_CDF_.resize(tot_bins_+1);
+  int32_t n_bins = this->n_sources();
+  std::vector<double> strengths(n_bins, 0.0);
+
+  mesh_CDF_.resize(n_bins+1);
   mesh_CDF_[0] = {0.0};
   total_strength_ = 0.0;
-  mesh_strengths_.resize(tot_bins_);
+  mesh_strengths_.resize(n_bins);
 
   // Create cdfs for sampling for an element over a mesh
   // Volume scheme is weighted by the volume of each tet
   // File scheme is weighted by an array given in the xml file
-
-  mesh_strengths_ = std::vector<double>(tot_bins_, 1.0);
+  mesh_strengths_ = std::vector<double>(n_bins, 1.0);
   if (check_for_node(node, "strengths")) {
       strengths = get_node_array<double>(node, "strengths");
       if (strengths.size() != mesh_strengths_.size()){
@@ -222,24 +219,27 @@ MeshSpatial::MeshSpatial(pugi::xml_node node)
   }
 
   if (get_node_value_bool(node, "volume_normalized")) {
-    for (int i = 0; i < tot_bins_; i++) {
+    for (int i = 0; i < n_bins; i++) {
       mesh_strengths_[i] *= mesh_ptr_->volume(i);
     }
   }
 
-  for (int i = 0; i<tot_bins_; i++){
-    temp_total_strength = temp_total_strength + mesh_strengths_[i];
-  }
-  total_strength_ = temp_total_strength;
-  for (int i = 0; i<tot_bins_; i++){
+  total_strength_ = std::accumulate(mesh_strengths_.begin(), mesh_strengths_.end(), 0.0);
+
+  for (int i = 0; i < n_bins; i++) {
     mesh_CDF_[i+1] = mesh_CDF_[i] + mesh_strengths_[i]/total_strength_;
   }
+
+  if (fabs(mesh_CDF_.back() - 1.0) > FP_COINCIDENT) {
+    fatal_error(fmt::format("Mesh sampling CDF is incorrectly formed. Final value is: {}", mesh_CDF_.back()));
+  }
+  mesh_CDF_.back() = 1.0;
 }
 
 Position MeshSpatial::sample(uint64_t* seed) const
 {
   // Create random variable for sampling element from mesh
-  float eta = prn(seed);
+  double eta = prn(seed);
   // Sample over the CDF defined in initialization above
   int32_t elem_bin = lower_bound_index(mesh_CDF_.begin(), mesh_CDF_.end(), eta);
   return mesh_ptr_->sample(seed, elem_bin);
diff --git a/src/mesh.cpp b/src/mesh.cpp
index 453ce572b7..abb6f8b8c8 100644
--- a/src/mesh.cpp
+++ b/src/mesh.cpp
@@ -219,9 +219,9 @@ Position UnstructuredMesh::sample_tet(std::array<Position, 4> coords, uint64_t*
       u = old_s + t + u - 1;
     }
   }
-  return s*(coords[1]-coords[0]) 
-    + t*(coords[2]-coords[0]) 
-    + u*(coords[3]-coords[0]) 
+  return s*(coords[1]-coords[0])
+    + t*(coords[2]-coords[0])
+    + u*(coords[3]-coords[0])
     + coords[0];
 
 }
@@ -358,12 +358,12 @@ StructuredMesh::MeshIndex StructuredMesh::get_indices_from_bin(int bin) const
   return ijk;
 }
 
-Position StructuredMesh::sample(uint64_t* seed, int32_t bin) const 
+Position StructuredMesh::sample(uint64_t* seed, int32_t bin) const
 {
   fatal_error("Position sampling on structured meshes is not yet implemented");
-} 
+}
 
-double StructuredMesh::volume(int bin) const 
+double StructuredMesh::volume(int bin) const
 {
   fatal_error("Unable to get volume of structured mesh, not yet implemented");
 }
@@ -2111,7 +2111,7 @@ Position MOABMesh::sample(uint64_t* seed, int32_t bin) const {
   for (int i = 0; i < 4; i++) {
     tet_verts[i] = {p[i][0], p[i][1], p[i][2]};
   }
-  // Samples position within tet using Barycentric stuff  
+  // Samples position within tet using Barycentric stuff
   Position r = this->sample_tet(tet_verts, seed);
 
   return r;
@@ -2579,7 +2579,7 @@ Position LibMesh::sample(uint64_t* seed, int32_t bin) const {
     auto node_ref = elem.node_ref(i);
     tet_verts[i] = {node_ref(0), node_ref(1), node_ref(2)};
   }
-  // Samples position within tet using Barycentric coordinates  
+  // Samples position within tet using Barycentric coordinates
   Position r = this->sample_tet(tet_verts, seed);
 
   return r;
@@ -2766,7 +2766,7 @@ const libMesh::Elem& LibMesh::get_element_from_bin(int bin) const
 
 double LibMesh::volume(int bin) const
 {
-  return m_->elem_ref(bin).volume();
+  return this->get_element_from_bin(bin).volume();
 }
 
 #endif // LIBMESH