diff --git a/source/RobotAPI/libraries/armem/server/ComponentPlugin.cpp b/source/RobotAPI/libraries/armem/server/ComponentPlugin.cpp
index 7b3a1d05817c9c25675abe2e5b8ab011aba1d92d..aa39625706836357c3fb30c7d075bf90728dbea4 100644
--- a/source/RobotAPI/libraries/armem/server/ComponentPlugin.cpp
+++ b/source/RobotAPI/libraries/armem/server/ComponentPlugin.cpp
@@ -1,5 +1,6 @@
 #include "ComponentPlugin.h"
 
+#include <ArmarXCore/core/Component.h>
 #include <ArmarXCore/core/exceptions/local/ExpressionException.h>
 
 #include <RobotAPI/libraries/armem/core/error.h>
@@ -11,8 +12,7 @@
 
 namespace armarx::armem::server::plugins
 {
-    ComponentPlugin::~ComponentPlugin()
-    {}
+    ComponentPlugin::~ComponentPlugin() = default;
 
 
     void ComponentPlugin::postCreatePropertyDefinitions(PropertyDefinitionsPtr& properties)
@@ -118,6 +118,8 @@ namespace armarx::armem::server
         addPlugin(plugin);
     }
 
+    ComponentPluginUser::~ComponentPluginUser() = default;
+
 
     // WRITING
     data::AddSegmentsResult ComponentPluginUser::addSegments(const data::AddSegmentsInput& input, const Ice::Current&)
@@ -148,7 +150,8 @@ namespace armarx::armem::server
         return iceMemory.query(input);
     }
 
-    // LTM LOADING
+
+    // LTM STORING
     data::StoreResult ComponentPluginUser::store(const data::StoreInput& input, const Ice::Current&)
     {
         std::scoped_lock lock(workingMemoryMutex, longtermMemoryMutex);
@@ -156,7 +159,7 @@ namespace armarx::armem::server
     }
 
 
-    // LTM STORING
+    // LTM LOADING
     armem::query::data::Result ComponentPluginUser::load(const armem::query::data::Input& input, const Ice::Current&)
     {
         std::scoped_lock lock(longtermMemoryMutex);
diff --git a/source/RobotAPI/libraries/armem/server/ComponentPlugin.h b/source/RobotAPI/libraries/armem/server/ComponentPlugin.h
index 5f9ef1d574df06b1644d733e494273ce0660dbbf..c03668ea87b3b921f661129a0196b3f0486bf1fb 100644
--- a/source/RobotAPI/libraries/armem/server/ComponentPlugin.h
+++ b/source/RobotAPI/libraries/armem/server/ComponentPlugin.h
@@ -2,7 +2,7 @@
 
 #include <mutex>
 
-#include <ArmarXCore/core/Component.h>
+#include <ArmarXCore/core/ComponentPlugin.h>
 
 #include <RobotAPI/interface/armem/server/MemoryInterface.h>
 #include <RobotAPI/interface/armem/client/MemoryListenerInterface.h>
@@ -73,7 +73,7 @@ namespace armarx::armem::server
     public:
 
         ComponentPluginUser();
-        virtual ~ComponentPluginUser() override = default;
+        virtual ~ComponentPluginUser() override;
 
 
         // WritingInterface interface
@@ -96,6 +96,7 @@ namespace armarx::armem::server
 
 
     public:
+
         /// The actual memory.
         wm::Memory workingMemory;
         std::mutex workingMemoryMutex;
@@ -112,6 +113,7 @@ namespace armarx::armem::server
 
 
     private:
+
         plugins::ComponentPlugin* plugin = nullptr;
 
     };