diff --git a/src/DetectorGeometry.cpp b/src/DetectorGeometry.cpp
index 9a35195..ee3525f 100644
--- a/src/DetectorGeometry.cpp
+++ b/src/DetectorGeometry.cpp
@@ -48,8 +48,8 @@ size_t DetectorGeometry::n_modules() const { return m_modules_x * m_modules_y; }
 size_t DetectorGeometry::pixels_x() const { return m_pixels_x; }
 size_t DetectorGeometry::pixels_y() const { return m_pixels_y; }
 
-size_t DetectorGeometry::modules_x() const { return m_modules_x; };
-size_t DetectorGeometry::modules_y() const { return m_modules_y; };
+size_t DetectorGeometry::modules_x() const { return m_modules_x; }
+size_t DetectorGeometry::modules_y() const { return m_modules_y; }
 
 const std::vector<ModuleGeometry> &
 DetectorGeometry::get_module_geometries() const {
diff --git a/src/Interpolator.cpp b/src/Interpolator.cpp
index 7d95994..cba401f 100644
--- a/src/Interpolator.cpp
+++ b/src/Interpolator.cpp
@@ -5,7 +5,7 @@ namespace aare {
 
 Interpolator::Interpolator(NDView<double, 1> xbins, NDView<double, 1> ybins,
                            NDView<double, 1> ebins)
-    : m_etabinsx(xbins), m_etabinsy(ybins), m_energy_bins(ebins){};
+    : m_etabinsx(xbins), m_etabinsy(ybins), m_energy_bins(ebins) {}
 
 Interpolator::Interpolator(NDView<double, 3> etacube, NDView<double, 1> xbins,
                            NDView<double, 1> ybins, NDView<double, 1> ebins)
diff --git a/src/ROIGeometry.cpp b/src/ROIGeometry.cpp
index 56611d1..04cf918 100644
--- a/src/ROIGeometry.cpp
+++ b/src/ROIGeometry.cpp
@@ -14,7 +14,7 @@ ROIGeometry::ROIGeometry(const ROI &roi, DetectorGeometry &geometry)
             m_module_indices_in_roi.push_back(i);
         }
     }
-};
+}
 
 ROIGeometry::ROIGeometry(DetectorGeometry &geometry)
     : m_pixels_x(geometry.pixels_x()), m_pixels_y(geometry.pixels_y()),
@@ -22,7 +22,7 @@ ROIGeometry::ROIGeometry(DetectorGeometry &geometry)
     m_module_indices_in_roi.resize(m_geometry.n_modules());
     std::iota(m_module_indices_in_roi.begin(), m_module_indices_in_roi.end(),
               0);
-};
+}
 
 size_t ROIGeometry::num_modules_in_roi() const {
     return m_module_indices_in_roi.size();
diff --git a/src/RawFile.cpp b/src/RawFile.cpp
index 70b4c7b..cecf3e8 100644
--- a/src/RawFile.cpp
+++ b/src/RawFile.cpp
@@ -248,7 +248,7 @@ size_t RawFile::num_rois() const {
     } else {
         return 0;
     }
-};
+}
 
 const ROIGeometry &RawFile::roi_geometries(size_t roi_index) const {
     return m_ROI_geometries[roi_index];
@@ -261,7 +261,7 @@ std::vector<size_t> RawFile::n_modules_in_roi() const {
         m_ROI_geometries.begin(), m_ROI_geometries.end(), results.begin(),
         [](const ROIGeometry &roi) { return roi.num_modules_in_roi(); });
     return results;
-};
+}
 
 void RawFile::open_subfiles(const size_t roi_index) {
 
diff --git a/src/RawMasterFile.cpp b/src/RawMasterFile.cpp
index e7ef637..919b2d9 100644
--- a/src/RawMasterFile.cpp
+++ b/src/RawMasterFile.cpp
@@ -71,7 +71,7 @@ ScanParameters::ScanParameters(const bool enabled, const DACIndex dac,
                                const int start, const int stop, const int step,
                                const int64_t settleTime)
     : m_enabled(enabled), m_dac(dac), m_start(start), m_stop(stop),
-      m_step(step), m_settleTime(settleTime){};
+      m_step(step), m_settleTime(settleTime) {}
 
 // "[enabled\ndac dac 4\nstart 500\nstop 2200\nstep 5\nsettleTime 100us\n]"
 ScanParameters::ScanParameters(const std::string &par) {