diff --git a/Core/Basics/ICloneable.h b/Core/Basics/ICloneable.h
index b322cc851d0a8652973f71134187a980cba8bfbf..32f409350cb37c2ba5fc946fa09edec3b681bd8b 100644
--- a/Core/Basics/ICloneable.h
+++ b/Core/Basics/ICloneable.h
@@ -27,11 +27,11 @@
 class BA_CORE_API_ ICloneable
 {
 public:
-	ICloneable();
-	virtual ~ICloneable();
+    ICloneable();
+    virtual ~ICloneable();
 
-	ICloneable(const ICloneable&) =delete;
-	ICloneable& operator=(const ICloneable&) =delete;
+    ICloneable(const ICloneable&) =delete;
+    ICloneable& operator=(const ICloneable&) =delete;
 
     virtual ICloneable* clone() const =0;
     virtual void transferToCPP() {} //!< Used for Python overriding of clone (see swig/tweaks.py)
diff --git a/Core/Computation/DWBAComputation.cpp b/Core/Computation/DWBAComputation.cpp
index e6db94dba6c5e5dd9ca628341a08cdc113c92476..dd9810f6f96b19cbad3597ca09abcce79367e0f0 100644
--- a/Core/Computation/DWBAComputation.cpp
+++ b/Core/Computation/DWBAComputation.cpp
@@ -27,9 +27,9 @@
 #include "MaterialFactoryFuncs.h"
 
 static_assert(std::is_copy_constructible<DWBAComputation>::value == false,
-	"DWBAComputation should not be copy constructable");
+    "DWBAComputation should not be copy constructable");
 static_assert(std::is_copy_assignable<DWBAComputation>::value == false,
-	"DWBAComputation should not be copy assignable");
+    "DWBAComputation should not be copy assignable");
 
 DWBAComputation::DWBAComputation(
     const MultiLayer& multilayer,
diff --git a/Core/Fitting/FitObject.cpp b/Core/Fitting/FitObject.cpp
index 3b190fb6c5c1c41dbe2a2d7694b690bf783dfb7f..252b981ea1f8e3c841b0f55007c3e0df4633ca3f 100644
--- a/Core/Fitting/FitObject.cpp
+++ b/Core/Fitting/FitObject.cpp
@@ -22,9 +22,9 @@
 #include "DetectorFunctions.h"
 
 static_assert(std::is_copy_constructible<FitObject>::value == false,
-	"FitObject should not be copy constructable");
+    "FitObject should not be copy constructable");
 static_assert(std::is_copy_assignable<FitObject>::value == false,
-	"FitObject should not be copy assignable");
+    "FitObject should not be copy assignable");
 
 FitObject::FitObject(const Simulation& simulation, const OutputData<double >& real_data,
     double weight)
diff --git a/Core/Fitting/FitSuiteObjects.cpp b/Core/Fitting/FitSuiteObjects.cpp
index 29381a3632a7df58a6e2f920a26253ecb2791f12..718e003de6c6609688c5195e9fdc9db87f55a85a 100644
--- a/Core/Fitting/FitSuiteObjects.cpp
+++ b/Core/Fitting/FitSuiteObjects.cpp
@@ -17,9 +17,9 @@
 #include "ChiSquaredModule.h"
 
 static_assert(std::is_copy_constructible<FitSuiteObjects>::value == false,
-	"FitSuiteObjects should not be copy constructable");
+    "FitSuiteObjects should not be copy constructable");
 static_assert(std::is_copy_assignable<FitSuiteObjects>::value == false,
-	"FitSuiteObjects should not be copy assignable");
+    "FitSuiteObjects should not be copy assignable");
 
 FitSuiteObjects::FitSuiteObjects()
   : m_total_weight(0)
diff --git a/Core/Multilayer/IFresnelMap.cpp b/Core/Multilayer/IFresnelMap.cpp
index da98f5e87d88a263c3eba8f84bbfb8266e940672..f64a32d22d2347c4c0371fc815e706f3d68f8d39 100644
--- a/Core/Multilayer/IFresnelMap.cpp
+++ b/Core/Multilayer/IFresnelMap.cpp
@@ -17,9 +17,9 @@
 #include "MultiLayer.h"
 
 static_assert(std::is_copy_constructible<IFresnelMap>::value == false,
-	"IFresnelMap should not be copy constructable");
+    "IFresnelMap should not be copy constructable");
 static_assert(std::is_copy_assignable<IFresnelMap>::value == false,
-	"IFresnelMap should not be copy assignable");
+    "IFresnelMap should not be copy assignable");
 
 IFresnelMap::IFresnelMap()
     : m_use_cache(true)