diff --git a/src/OpenVolumeMesh/Mesh/TetrahedralMeshIterators.cc b/src/OpenVolumeMesh/Mesh/TetrahedralMeshIterators.cc
index dc5261caa2a7fd200bbd53025794ad1ab7d34039..c99eb8b246b490c6a0981f9b2608296e49dfb10c 100644
--- a/src/OpenVolumeMesh/Mesh/TetrahedralMeshIterators.cc
+++ b/src/OpenVolumeMesh/Mesh/TetrahedralMeshIterators.cc
@@ -64,27 +64,24 @@ BaseIter(_mesh, _ref_h, _max_laps) {
     HalfEdgeHandle curHE = *_mesh->halfface(curHF).halfedges().begin();
     assert(curHE.is_valid());
 
-    vertices_.push_back(_mesh->halfedge(curHE).to_vertex());
+    vertices_[0] = _mesh->halfedge(curHE).to_vertex();
 
     curHE = _mesh->next_halfedge_in_halfface(curHE, curHF);
 
-    vertices_.push_back(_mesh->halfedge(curHE).to_vertex());
+    vertices_[1] = _mesh->halfedge(curHE).to_vertex();
 
     curHE = _mesh->next_halfedge_in_halfface(curHE, curHF);
 
-    vertices_.push_back(_mesh->halfedge(curHE).to_vertex());
+    vertices_[2] = _mesh->halfedge(curHE).to_vertex();
 
     curHF = _mesh->adjacent_halfface_in_cell(curHF, curHE);
     curHE = _mesh->opposite_halfedge_handle(curHE);
     curHE = _mesh->next_halfedge_in_halfface(curHE, curHF);
 
-    vertices_.push_back(_mesh->halfedge(curHE).to_vertex());
+    vertices_[3] = _mesh->halfedge(curHE).to_vertex();
 
     cur_index_ = 0;
-    BaseIter::valid(vertices_.size() > 0);
-    if(BaseIter::valid()) {
-        BaseIter::cur_handle(vertices_[cur_index_]);
-    }
+    BaseIter::cur_handle(vertices_[cur_index_]);
 }
 
 
diff --git a/src/OpenVolumeMesh/Mesh/TetrahedralMeshIterators.hh b/src/OpenVolumeMesh/Mesh/TetrahedralMeshIterators.hh
index d366b6ddc6fb6f1ccf9c5741f872a44b065ebadd..156b0d219c9f29ecde504be8b90a7f84b5c4cf7e 100644
--- a/src/OpenVolumeMesh/Mesh/TetrahedralMeshIterators.hh
+++ b/src/OpenVolumeMesh/Mesh/TetrahedralMeshIterators.hh
@@ -1,3 +1,4 @@
+#pragma once
 /*===========================================================================*\
  *                                                                           *
  *                            OpenVolumeMesh                                 *
@@ -32,20 +33,11 @@
  *                                                                           *
 \*===========================================================================*/
 
-/*===========================================================================*\
- *                                                                           *
- *   $Revision$                                                         *
- *   $Date$                    *
- *   $LastChangedBy$                                                *
- *                                                                           *
-\*===========================================================================*/
-
-#ifndef TETRAHEDRALMESHITERATORS_HH
-#define TETRAHEDRALMESHITERATORS_HH
-
 #include "../Core/Iterators.hh"
 #include "OpenVolumeMesh/Config/Export.hh"
 
+#include <array>
+
 namespace OpenVolumeMesh {
 
 class TetrahedralMeshTopologyKernel;
@@ -109,10 +101,8 @@ public:
     TetVertexIter& operator--();
 
 private:
-    std::vector<VertexHandle> vertices_;
+    std::array<VertexHandle, 4> vertices_;
     size_t cur_index_;
 };
 
 } // Namespace OpenVolumeMesh
-
-#endif /* TETRAHEDRALMESHITERATORS_HH */
diff --git a/src/OpenVolumeMesh/Mesh/TetrahedralMeshTopologyKernel.hh b/src/OpenVolumeMesh/Mesh/TetrahedralMeshTopologyKernel.hh
index 23d03c332dd3b9401e3aa28e306d3dc696a1a99d..7d7244ab66d176665296631da91eaf71c6a96f66 100644
--- a/src/OpenVolumeMesh/Mesh/TetrahedralMeshTopologyKernel.hh
+++ b/src/OpenVolumeMesh/Mesh/TetrahedralMeshTopologyKernel.hh
@@ -1,3 +1,4 @@
+#pragma once
 /*===========================================================================*\
  *                                                                           *
  *                            OpenVolumeMesh                                 *
@@ -32,16 +33,6 @@
  *                                                                           *
 \*===========================================================================*/
 
-/*===========================================================================*\
- *                                                                           *
- *   $Revision$                                                         *
- *   $Date$                    *
- *   $LastChangedBy$                                                *
- *                                                                           *
-\*===========================================================================*/
-
-#ifndef TETRAHEDRALMESHTOPOLOGYKERNEL_HH
-#define TETRAHEDRALMESHTOPOLOGYKERNEL_HH
 
 #ifndef NDEBUG
 #include <iostream>
@@ -133,4 +124,3 @@ private:
 
 } // Namespace OpenVolumeMesh
 
-#endif /* TETRAHEDRALMESHTOPOLOGYKERNEL_HH */