diff --git a/mission/tmtc/PusTmFunnel.cpp b/mission/tmtc/PusTmFunnel.cpp
index 814dd24e..87aa8840 100644
--- a/mission/tmtc/PusTmFunnel.cpp
+++ b/mission/tmtc/PusTmFunnel.cpp
@@ -53,8 +53,8 @@ ReturnValue_t PusTmFunnel::performOperation(uint8_t) {
   CommandMessage cmdMessage;
   ReturnValue_t status = tcQueue->receiveMessage(&cmdMessage);
   if (status == returnvalue::OK) {
-    ReturnValue_t  result = handleTcRequest(cmdMessage);
-    if(result != returnvalue::OK) {
+    ReturnValue_t result = handleTcRequest(cmdMessage);
+    if (result != returnvalue::OK) {
       sif::error << "PusTmFunnel::performOperation: Error handling TC request" << std::endl;
     }
   }
diff --git a/mission/tmtc/PusTmFunnel.h b/mission/tmtc/PusTmFunnel.h
index 615d36ea..2067be51 100644
--- a/mission/tmtc/PusTmFunnel.h
+++ b/mission/tmtc/PusTmFunnel.h
@@ -6,12 +6,12 @@
 #include <fsfw/tasks/ExecutableObjectIF.h>
 #include <fsfw/tmtcservices/AcceptsTelemetryIF.h>
 #include <fsfw/tmtcservices/TmTcMessage.h>
-#include "fsfw/ipc/CommandMessage.h"
 #include <mission/tmtc/TmFunnelBase.h>
 
 #include <vector>
 
 #include "PersistentTmStore.h"
+#include "fsfw/ipc/CommandMessage.h"
 #include "fsfw/timemanager/TimeReaderIF.h"
 
 /**
@@ -44,7 +44,7 @@ class PusTmFunnel : public TmFunnelBase {
   TmStore hkStore;
   SdCardMountedIF &sdcMan;
 
-  ReturnValue_t handleTcRequest(CommandMessage& msg);
+  ReturnValue_t handleTcRequest(CommandMessage &msg);
   ReturnValue_t handleTmPacket(TmTcMessage &message);
   void initStoresIfPossible(bool sdCardUsable);
   ReturnValue_t initialize() override;
diff --git a/mission/tmtc/Service15TmStorage.cpp b/mission/tmtc/Service15TmStorage.cpp
index d752bf00..ce753f66 100644
--- a/mission/tmtc/Service15TmStorage.cpp
+++ b/mission/tmtc/Service15TmStorage.cpp
@@ -16,14 +16,14 @@ Service15TmStorage::Service15TmStorage(object_id_t objectId, uint16_t apid,
 
 ReturnValue_t Service15TmStorage::isValidSubservice(uint8_t subservice) {
   switch (subservice) {
+    case (Subservices::DELETE_UP_TO):
     case (Subservices::START_BY_TIME_RANGE_RETRIEVAL): {
       return OK;
     }
-    case (Subservices::DELETE_UP_TO): {
-      return OK;
+    default: {
+      return FAILED;
     }
   }
-  return FAILED;
 }
 
 ReturnValue_t Service15TmStorage::getMessageQueueAndObject(uint8_t subservice,