diff --git a/memory/FileSystemMessage.cpp b/memory/FileSystemMessage.cpp
index fe1ff2b8..0d1421fa 100644
--- a/memory/FileSystemMessage.cpp
+++ b/memory/FileSystemMessage.cpp
@@ -1,12 +1,5 @@
-/*
- * FileSystemMessage.cpp
- *
- *  Created on: 19.01.2020
- *      Author: Jakob Meier
- */
-
-#include <framework/memory/FileSystemMessage.h>
-#include <framework/objectmanager/ObjectManagerIF.h>
+#include "FileSystemMessage.h"
+#include "../objectmanager/ObjectManagerIF.h"
 
 
 ReturnValue_t FileSystemMessage::setDeleteFileCommand(
diff --git a/memory/FileSystemMessage.h b/memory/FileSystemMessage.h
index cbc4f8bf..348c9409 100644
--- a/memory/FileSystemMessage.h
+++ b/memory/FileSystemMessage.h
@@ -1,17 +1,13 @@
-/*
- * FileSystemMessage.h
- *
- *  Created on: 19.01.2020
- *      Author: Jakob Meier
+#ifndef FSFW_MEMORY_FILESYSTEMMESSAGE_H_
+#define FSFW_MEMORY_FILESYSTEMMESSAGE_H_
+
+#include "../ipc/CommandMessage.h"
+#include "../storagemanager/StorageManagerIF.h"
+#include "../objectmanager/SystemObject.h"
+
+/**
+ * @author  Jakob Meier
  */
-
-#ifndef FRAMEWORK_MEMORY_FILESYSTEMMESSAGE_H_
-#define FRAMEWORK_MEMORY_FILESYSTEMMESSAGE_H_
-
-#include <framework/ipc/CommandMessage.h>
-#include <framework/storagemanager/StorageManagerIF.h>
-#include <framework/objectmanager/SystemObject.h>
-
 class FileSystemMessage {
 private:
 	FileSystemMessage(); //A private ctor inhibits instantiation
@@ -37,4 +33,4 @@ public:
 	static void setCompletionReply(CommandMessage* message, Command_t completionStatus);
 };
 
-#endif /* FRAMEWORK_MEMORY_FILESYSTEMMESSAGE_H_ */
+#endif /* FSFW_MEMORY_FILESYSTEMMESSAGE_H_ */
diff --git a/pus/Service2DeviceAccess.cpp b/pus/Service2DeviceAccess.cpp
index 9529c675..8780b22c 100644
--- a/pus/Service2DeviceAccess.cpp
+++ b/pus/Service2DeviceAccess.cpp
@@ -39,8 +39,7 @@ ReturnValue_t Service2DeviceAccess::getMessageQueueAndObject(
     SerializeAdapter::deSerialize(objectId, &tcData,
                 &tcDataLen, SerializeIF::Endianness::BIG);
 
-	ReturnValue_t result = checkInterfaceAndAcquireMessageQueue(id,objectId);
-	return result;
+    return checkInterfaceAndAcquireMessageQueue(id,objectId);
 }
 
 ReturnValue_t Service2DeviceAccess::checkInterfaceAndAcquireMessageQueue(