diff --git a/src/fsfw/internalerror/InternalErrorReporter.cpp b/src/fsfw/internalerror/InternalErrorReporter.cpp
index e6bdc580..e2cd292f 100644
--- a/src/fsfw/internalerror/InternalErrorReporter.cpp
+++ b/src/fsfw/internalerror/InternalErrorReporter.cpp
@@ -9,10 +9,10 @@ InternalErrorReporter::InternalErrorReporter(object_id_t setObjectId, uint32_t m
                                              bool enableSetByDefault,
                                              dur_millis_t generationFrequency)
     : SystemObject(setObjectId),
+      sharedPool(getObjectId()),
       hkHelper(this, nullptr),
       enableSetByDefault(enableSetByDefault),
       generationFrequency(generationFrequency),
-      sharedPool(getObjectId()),
       internalErrorSid(setObjectId, InternalErrorDataset::ERROR_SET_ID),
       internalErrorDataset(sharedPool) {
   commandQueue = QueueFactory::instance()->createMessageQueue(messageQueueDepth);
@@ -144,14 +144,6 @@ ReturnValue_t InternalErrorReporter::initializeLocalDataPool(
 }
  */
 
-// dur_millis_t InternalErrorReporter::getPeriodicOperationFrequency() const {
-// return this->executingTask->getPeriodMs();
-//}
-
-// LocalPoolDataSetBase *InternalErrorReporter::getDataSetHandle(sid_t sid) {
-// return &internalErrorDataset;
-//}
-
 void InternalErrorReporter::setTaskIF(PeriodicTaskIF *task) { this->executingTask = task; }
 
 ReturnValue_t InternalErrorReporter::initialize() {
@@ -162,23 +154,18 @@ ReturnValue_t InternalErrorReporter::initialize() {
   return SystemObject::initialize();
 }
 
-ReturnValue_t InternalErrorReporter::initializeAfterTaskCreation() {
-  // return poolManager.initializeAfterTaskCreation();
-}
-
 void InternalErrorReporter::setMutexTimeout(MutexIF::TimeoutType timeoutType, uint32_t timeoutMs) {
   this->timeoutType = timeoutType;
   this->timeoutMs = timeoutMs;
 }
 
-// PeriodicHkGenerationHelper *InternalErrorReporter::getHkManagerHandle() { return &poolManager; }
-
 ReturnValue_t InternalErrorReporter::serializeDataset(sid_t structureId, uint8_t *buf,
                                                       size_t maxSize) {
   if (structureId == internalErrorDataset.getSid()) {
     size_t serSize = 0;
-    internalErrorDataset.serialize(buf, serSize, maxSize, SerializeIF::Endianness::NETWORK);
+    return internalErrorDataset.serialize(buf, serSize, maxSize, SerializeIF::Endianness::NETWORK);
   }
+  return returnvalue::FAILED;
 }
 
 ReturnValue_t InternalErrorReporter::specifyDatasets(
diff --git a/src/fsfw/internalerror/InternalErrorReporter.h b/src/fsfw/internalerror/InternalErrorReporter.h
index 31f86727..22943000 100644
--- a/src/fsfw/internalerror/InternalErrorReporter.h
+++ b/src/fsfw/internalerror/InternalErrorReporter.h
@@ -33,31 +33,28 @@ class InternalErrorReporter : public SystemObject,
 
   void setMutexTimeout(MutexIF::TimeoutType timeoutType, uint32_t timeoutMs);
 
-  virtual ~InternalErrorReporter();
+  ~InternalErrorReporter() override;
 
-  virtual object_id_t getObjectId() const override;
-  virtual MessageQueueId_t getCommandQueue() const override;
+  [[nodiscard]] object_id_t getObjectId() const override;
+  [[nodiscard]] MessageQueueId_t getCommandQueue() const override;
 
-  virtual localpool::SharedPool* getOptionalSharedPool() override;
+  localpool::SharedPool* getOptionalSharedPool() override;
 
-  virtual ReturnValue_t serializeDataset(sid_t structureId, uint8_t* buf, size_t maxSize) override;
+  ReturnValue_t serializeDataset(sid_t structureId, uint8_t* buf, size_t maxSize) override;
 
-  virtual ReturnValue_t specifyDatasets(
+  ReturnValue_t specifyDatasets(
       std::vector<periodicHk::SetSpecification>& setSpecification) override;
 
-  // PeriodicHkGenerationHelper* getHkManagerHandle() override;
+  ReturnValue_t initialize() override;
+  ReturnValue_t performOperation(uint8_t opCode) override;
 
-  virtual ReturnValue_t initialize() override;
-  virtual ReturnValue_t initializeAfterTaskCreation() override;
-  virtual ReturnValue_t performOperation(uint8_t opCode) override;
+  void queueMessageNotSent() override;
 
-  virtual void queueMessageNotSent() override;
+  void lostTm() override;
 
-  virtual void lostTm() override;
+  void storeFull() override;
 
-  virtual void storeFull() override;
-
-  virtual void setTaskIF(PeriodicTaskIF* task) override;
+  void setTaskIF(PeriodicTaskIF* task) override;
 
  protected:
   MessageQueueIF* commandQueue;