diff --git a/datapoollocal/internal/HasLocalDpIFManagerAttorney.cpp b/datapoollocal/internal/HasLocalDpIFManagerAttorney.cpp
index bc07170f..65feda75 100644
--- a/datapoollocal/internal/HasLocalDpIFManagerAttorney.cpp
+++ b/datapoollocal/internal/HasLocalDpIFManagerAttorney.cpp
@@ -4,15 +4,15 @@
 #include "../HasLocalDataPoolIF.h"
 
 LocalPoolDataSetBase* HasLocalDpIFManagerAttorney::getDataSetHandle(HasLocalDataPoolIF* clientIF,
-		sid_t sid) {
-	return clientIF->getDataSetHandle(sid);
+        sid_t sid) {
+    return clientIF->getDataSetHandle(sid);
 }
 
 LocalPoolObjectBase* HasLocalDpIFManagerAttorney::getPoolObjectHandle(HasLocalDataPoolIF* clientIF,
-		lp_id_t localPoolId) {
-	return clientIF->getPoolObjectHandle(localPoolId);
+        lp_id_t localPoolId) {
+    return clientIF->getPoolObjectHandle(localPoolId);
 }
 
 object_id_t HasLocalDpIFManagerAttorney::getObjectId(HasLocalDataPoolIF* clientIF) {
-	return clientIF->getObjectId();
+    return clientIF->getObjectId();
 }
diff --git a/datapoollocal/internal/HasLocalDpIFManagerAttorney.h b/datapoollocal/internal/HasLocalDpIFManagerAttorney.h
index ef180b37..dfe333a6 100644
--- a/datapoollocal/internal/HasLocalDpIFManagerAttorney.h
+++ b/datapoollocal/internal/HasLocalDpIFManagerAttorney.h
@@ -9,14 +9,14 @@ class LocalPoolObjectBase;
 
 class HasLocalDpIFManagerAttorney {
 
-	static LocalPoolDataSetBase* getDataSetHandle(HasLocalDataPoolIF* clientIF, sid_t sid);
+    static LocalPoolDataSetBase* getDataSetHandle(HasLocalDataPoolIF* clientIF, sid_t sid);
 
-	static LocalPoolObjectBase* getPoolObjectHandle(HasLocalDataPoolIF* clientIF,
-			lp_id_t localPoolId);
+    static LocalPoolObjectBase* getPoolObjectHandle(HasLocalDataPoolIF* clientIF,
+            lp_id_t localPoolId);
 
-	static object_id_t getObjectId(HasLocalDataPoolIF* clientIF);
+    static object_id_t getObjectId(HasLocalDataPoolIF* clientIF);
 
-	friend class LocalDataPoolManager;
+    friend class LocalDataPoolManager;
 };
 
 #endif /* FSFW_DATAPOOLLOCAL_HASLOCALDPIFMANAGERATTORNEY_H_ */
diff --git a/datapoollocal/internal/HasLocalDpIFUserAttorney.h b/datapoollocal/internal/HasLocalDpIFUserAttorney.h
index a07c2d59..77eaa8bd 100644
--- a/datapoollocal/internal/HasLocalDpIFUserAttorney.h
+++ b/datapoollocal/internal/HasLocalDpIFUserAttorney.h
@@ -7,10 +7,10 @@ class AccessPoolManagerIF;
 class HasLocalDpIFUserAttorney {
 private:
 
-	static AccessPoolManagerIF* getAccessorHandle(HasLocalDataPoolIF* clientIF);
+    static AccessPoolManagerIF* getAccessorHandle(HasLocalDataPoolIF* clientIF);
 
-	friend class LocalPoolObjectBase;
-	friend class LocalPoolDataSetBase;
+    friend class LocalPoolObjectBase;
+    friend class LocalPoolDataSetBase;
 
 };
 
diff --git a/datapoollocal/internal/LocalDpManagerAttorney.h b/datapoollocal/internal/LocalDpManagerAttorney.h
index 9047d158..bb64fb42 100644
--- a/datapoollocal/internal/LocalDpManagerAttorney.h
+++ b/datapoollocal/internal/LocalDpManagerAttorney.h
@@ -15,18 +15,18 @@
  */
 class LocalDpManagerAttorney {
 private:
-	template<typename T> static ReturnValue_t fetchPoolEntry(LocalDataPoolManager& manager,
-			lp_id_t localPoolId, PoolEntry<T> **poolEntry) {
-		return manager.fetchPoolEntry(localPoolId, poolEntry);
-	}
+    template<typename T> static ReturnValue_t fetchPoolEntry(LocalDataPoolManager& manager,
+            lp_id_t localPoolId, PoolEntry<T> **poolEntry) {
+        return manager.fetchPoolEntry(localPoolId, poolEntry);
+    }
 
-	static MutexIF* getMutexHandle(LocalDataPoolManager& manager) {
-		return manager.getMutexHandle();
-	}
+    static MutexIF* getMutexHandle(LocalDataPoolManager& manager) {
+        return manager.getMutexHandle();
+    }
 
 
-	template<typename T> friend class LocalPoolVariable;
-	template<typename T, uint16_t vecSize> friend class LocalPoolVector;
+    template<typename T> friend class LocalPoolVariable;
+    template<typename T, uint16_t vecSize> friend class LocalPoolVector;
 };
 
 #endif /* FSFW_DATAPOOLLOCAL_LOCALDPMANAGERATTORNEY_H_ */
diff --git a/datapoollocal/internal/LocalPoolDataSetAttorney.h b/datapoollocal/internal/LocalPoolDataSetAttorney.h
index 9804444a..7a34e9c8 100644
--- a/datapoollocal/internal/LocalPoolDataSetAttorney.h
+++ b/datapoollocal/internal/LocalPoolDataSetAttorney.h
@@ -5,34 +5,34 @@
 
 class LocalPoolDataSetAttorney {
 private:
-	static void setDiagnostic(LocalPoolDataSetBase& set, bool diagnostics) {
-		set.setDiagnostic(diagnostics);
-	}
+    static void setDiagnostic(LocalPoolDataSetBase& set, bool diagnostics) {
+        set.setDiagnostic(diagnostics);
+    }
 
-	static bool isDiagnostics(LocalPoolDataSetBase& set) {
-		return set.isDiagnostics();
-	}
+    static bool isDiagnostics(LocalPoolDataSetBase& set) {
+        return set.isDiagnostics();
+    }
 
-	static void initializePeriodicHelper(LocalPoolDataSetBase& set, float collectionInterval,
-			uint32_t minimumPeriodicIntervalMs,
-			bool isDiagnostics, uint8_t nonDiagIntervalFactor = 5) {
-		set.initializePeriodicHelper(collectionInterval, minimumPeriodicIntervalMs, isDiagnostics,
-				nonDiagIntervalFactor);
-	}
+    static void initializePeriodicHelper(LocalPoolDataSetBase& set, float collectionInterval,
+            uint32_t minimumPeriodicIntervalMs,
+            bool isDiagnostics, uint8_t nonDiagIntervalFactor = 5) {
+        set.initializePeriodicHelper(collectionInterval, minimumPeriodicIntervalMs, isDiagnostics,
+                nonDiagIntervalFactor);
+    }
 
-	static void setReportingEnabled(LocalPoolDataSetBase& set, bool enabled) {
-		set.setReportingEnabled(enabled);
-	}
+    static void setReportingEnabled(LocalPoolDataSetBase& set, bool enabled) {
+        set.setReportingEnabled(enabled);
+    }
 
-	static bool getReportingEnabled(LocalPoolDataSetBase& set) {
-		return set.getReportingEnabled();
-	}
+    static bool getReportingEnabled(LocalPoolDataSetBase& set) {
+        return set.getReportingEnabled();
+    }
 
-	static PeriodicHousekeepingHelper* getPeriodicHelper(LocalPoolDataSetBase& set) {
-		return set.periodicHelper;
-	}
+    static PeriodicHousekeepingHelper* getPeriodicHelper(LocalPoolDataSetBase& set) {
+        return set.periodicHelper;
+    }
 
-	friend class LocalDataPoolManager;
+    friend class LocalDataPoolManager;
 };