diff --git a/inc/Services/EventActionService.hpp b/inc/Services/EventActionService.hpp
index 974a65266071b34d62fe88cd9e678914893fcff3..43dffb29e9802831a24c3b64f87ea556fc8d56e4 100644
--- a/inc/Services/EventActionService.hpp
+++ b/inc/Services/EventActionService.hpp
@@ -126,7 +126,7 @@ public:
 	 * @note This function is called from the main execute() that is defined in the file MessageParser.hpp
 	 * @param message Contains the necessary parameters to call the suitable subservice
 	 */
-	void execute(const Message &message);
+	void execute(const Message& message);
 };
 
 #endif //ECSS_SERVICES_EVENTACTIONSERVICE_HPP
diff --git a/inc/Services/EventReportService.hpp b/inc/Services/EventReportService.hpp
index 842afe02dc29fa0c708784f0ee188970c2830079..3ed47d86a1577189f8ce9e1f2c0e619f740e0055 100644
--- a/inc/Services/EventReportService.hpp
+++ b/inc/Services/EventReportService.hpp
@@ -182,7 +182,7 @@ public:
 	 * @note This function is called from the main execute() that is defined in the file MessageParser.hpp
 	 * @param param Contains the necessary parameters to call the suitable subservice
 	 */
-	void execute(const Message &message);
+	void execute(const Message& message);
 };
 
 #endif //ECSS_SERVICES_EVENTREPORTSERVICE_HPP
diff --git a/inc/Services/FunctionManagementService.hpp b/inc/Services/FunctionManagementService.hpp
index a48874393261a383502e47548d7b05584c066d6e..7b11f4177d65d29b383ba5b7136229b7800c694e 100644
--- a/inc/Services/FunctionManagementService.hpp
+++ b/inc/Services/FunctionManagementService.hpp
@@ -98,7 +98,7 @@ public:
 	 * @note This function is called from the main execute() that is defined in the file MessageParser.hpp
 	 * @param param Contains the necessary parameters to call the suitable subservice
 	 */
-	void execute(Message &param);
+	void execute(Message& param);
 };
 
 #endif //ECSS_SERVICES_FUNCTIONMANAGEMENTSERVICE_HPP
diff --git a/inc/Services/MemoryManagementService.hpp b/inc/Services/MemoryManagementService.hpp
index 418a0cbdaa6e5dd33104c46bb005d9d4bc2879ff..2995924cad2de34b006959dafc5095899ea842e0 100644
--- a/inc/Services/MemoryManagementService.hpp
+++ b/inc/Services/MemoryManagementService.hpp
@@ -79,7 +79,7 @@ public:
 		 * @note This function is called from the main execute() that is defined in the file MessageParser.hpp
 		 * @param param Contains the necessary parameters to call the suitable subservice
 		 */
-		void execute(Message &message);
+		void execute(Message& message);
 	} rawDataMemorySubservice;
 
 private:
diff --git a/inc/Services/ParameterService.hpp b/inc/Services/ParameterService.hpp
index e6d1aa58229b68617e8ef3de300faec3c894174b..687fd32d07f48a1df09c668b4feaf63a236c2f8b 100644
--- a/inc/Services/ParameterService.hpp
+++ b/inc/Services/ParameterService.hpp
@@ -94,7 +94,7 @@ public:
 	 * @note This function is called from the main execute() that is defined in the file MessageParser.hpp
 	 * @param param Contains the necessary parameters to call the suitable subservice
 	 */
-	void execute(Message &message);
+	void execute(Message& message);
 
 };
 
diff --git a/inc/Services/TestService.hpp b/inc/Services/TestService.hpp
index 937c1b97888e3ce1eb84f643b0dc34bd110329bc..cb8afc67dd97511083e9fc744073261731336ec8 100644
--- a/inc/Services/TestService.hpp
+++ b/inc/Services/TestService.hpp
@@ -31,7 +31,7 @@ public:
 	 *
 	 * @todo Error handling for the switch() in the implementation of this execute function
 	 */
-	void execute(Message &message);
+	void execute(Message& message);
 };
 
 
diff --git a/inc/Services/TimeBasedSchedulingService.hpp b/inc/Services/TimeBasedSchedulingService.hpp
index cd6b6e03dd701a0a00d44dd8a2bc3cc1a782e5ee..ff8589b3c15f51c8d8c3d18639d1f349065e7b15 100644
--- a/inc/Services/TimeBasedSchedulingService.hpp
+++ b/inc/Services/TimeBasedSchedulingService.hpp
@@ -253,7 +253,7 @@ public:
 	 * @note This function is called from the main execute() that is defined in the file MessageParser.hpp
 	 * @param message Contains the necessary parameters to call the suitable subservice
 	 */
-	void execute(Message &message);
+	void execute(Message& message);
 };
 
 #endif //ECSS_SERVICES_TIMEBASEDSCHEDULINGSERVICE_HPP
diff --git a/inc/Services/TimeManagementService.hpp b/inc/Services/TimeManagementService.hpp
index 073d2a50d7363ee2f6d746a475cd6307e0cd309b..5812de3763c76234d27725e114376296468c90f9 100644
--- a/inc/Services/TimeManagementService.hpp
+++ b/inc/Services/TimeManagementService.hpp
@@ -70,7 +70,7 @@ public:
 	 * @note This function is called from the main execute() that is defined in the file MessageParser.hpp
 	 * @param message Contains the necessary parameters to call the suitable subservice
 	 */
-	void execute(Message &message);
+	void execute(Message& message);
 };
 
 
diff --git a/src/Service.cpp b/src/Service.cpp
index 9a74dba560b2bc0043fb67245d0b7f17bef0ac76..e308a62c182d0f957f10889a1c67cde626e549f0 100644
--- a/src/Service.cpp
+++ b/src/Service.cpp
@@ -1,7 +1,7 @@
 #include "Service.hpp"
 #include "ServicePool.hpp"
 
-void Service::execute(Message &message) {
+void Service::execute(Message& message) {
 	switch (message.serviceType) {
 		case 5:
 			Services.eventReport.execute(message); // ST[05]
@@ -28,6 +28,5 @@ void Service::execute(Message &message) {
 			Services.parameterManagement.execute(message); // ST[20]
 		default:
 			ErrorHandler::reportInternalError(ErrorHandler::OtherMessageType);
-			break;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Services/EventActionService.cpp b/src/Services/EventActionService.cpp
index 4c456e11fa2c615495fa32983dd3b65da8022e3d..95ed674f27dd12359be9c57c36057ade96244062 100644
--- a/src/Services/EventActionService.cpp
+++ b/src/Services/EventActionService.cpp
@@ -192,7 +192,7 @@ void EventActionService::executeAction(uint16_t eventID) {
 	}
 }
 
-void EventActionService::execute(const Message &message) {
+void EventActionService::execute(const Message& message) {
 	switch (message.messageType) {
 		case 1:
 			addEventActionDefinitions(message); // TC[19,1]
@@ -220,6 +220,5 @@ void EventActionService::execute(const Message &message) {
 			break;
 		default:
 			ErrorHandler::reportInternalError(ErrorHandler::OtherMessageType);
-			break;
 	}
 }
diff --git a/src/Services/EventReportService.cpp b/src/Services/EventReportService.cpp
index 22a1cf659478a155547d3eef9cc105b8a9b9965a..ae2888e2587a5654207e90b0bffe960451d54696 100644
--- a/src/Services/EventReportService.cpp
+++ b/src/Services/EventReportService.cpp
@@ -131,7 +131,7 @@ void EventReportService::listOfDisabledEventsReport() {
 	storeMessage(report);
 }
 
-void EventReportService::execute(const Message &message) {
+void EventReportService::execute(const Message& message) {
 	switch (message.messageType) {
 		case 5: enableReportGeneration(message); // TC[5,5]
 			break;
@@ -141,6 +141,5 @@ void EventReportService::execute(const Message &message) {
 			break;
 		default:
 			ErrorHandler::reportInternalError(ErrorHandler::OtherMessageType);
-			break;
 	}
 }
diff --git a/src/Services/FunctionManagementService.cpp b/src/Services/FunctionManagementService.cpp
index 27435a6bb7efc7766dc4b23c99a2a9d7b6b7b8a9..7b41c862e0eb5c524b742c3822ce8aaac2723b09 100644
--- a/src/Services/FunctionManagementService.cpp
+++ b/src/Services/FunctionManagementService.cpp
@@ -51,13 +51,12 @@ void FunctionManagementService::include(String<FUNC_NAME_LENGTH> funcName, void(
 	}
 }
 
-void FunctionManagementService::execute(Message &message) {
+void FunctionManagementService::execute(Message& message) {
 	switch (message.messageType) {
 		case 1:
 			call(message); // TC[8,1]
 			break;
 		default:
 			ErrorHandler::reportInternalError(ErrorHandler::OtherMessageType);
-			break;
 	}
 }
diff --git a/src/Services/MemoryManagementService.cpp b/src/Services/MemoryManagementService.cpp
index be7ec5b54520b0e574c5f98e0236e09589f95284..a963c3e4a3e4c345ce9845765ccb05659a35250b 100644
--- a/src/Services/MemoryManagementService.cpp
+++ b/src/Services/MemoryManagementService.cpp
@@ -231,7 +231,7 @@ inline bool MemoryManagementService::dataValidator(const uint8_t *data, uint16_t
 	return (checksum == CRCHelper::calculateCRC(data, length));
 }
 
-void MemoryManagementService::RawDataMemoryManagement::execute(Message &message) {
+void MemoryManagementService::RawDataMemoryManagement::execute(Message& message) {
 	switch (message.messageType) {
 		case 2:
 			loadRawData(message); // TC[6,2]
@@ -244,6 +244,5 @@ void MemoryManagementService::RawDataMemoryManagement::execute(Message &message)
 			break;
 		default:
 			ErrorHandler::reportInternalError(ErrorHandler::OtherMessageType);
-			break;
 	}
 }
diff --git a/src/Services/ParameterService.cpp b/src/Services/ParameterService.cpp
index d8cd9bb2a54392b02dd7a41331f7c4cecbc4db08..710e8bb058f3a1f4a75287f362c186cd02de01ca 100644
--- a/src/Services/ParameterService.cpp
+++ b/src/Services/ParameterService.cpp
@@ -120,7 +120,7 @@ uint16_t ParameterService::numOfValidIds(Message idMsg) {
 	return validIds;
 }
 
-void ParameterService::execute(Message  &message) {
+void ParameterService::execute(Message& message) {
 	switch (message.messageType) {
 		case 1:
 			reportParameterIds(message); // TC[20,1]
@@ -129,6 +129,5 @@ void ParameterService::execute(Message  &message) {
 			setParameterIds(message); // TC[20,3]
 		default:
 			ErrorHandler::reportInternalError(ErrorHandler::OtherMessageType);
-			break;
 	}
 }
diff --git a/src/Services/TestService.cpp b/src/Services/TestService.cpp
index 462fbfc87f54b476a89ef35592ca189798c59d10..5dab3a0a4c4a7faf800dbbc7e8b671388012218e 100644
--- a/src/Services/TestService.cpp
+++ b/src/Services/TestService.cpp
@@ -18,7 +18,7 @@ void TestService::onBoardConnection(Message &request) {
 	storeMessage(report);
 }
 
-void TestService::execute(Message &message) {
+void TestService::execute(Message& message) {
 	switch (message.messageType) {
 		case 1:
 			areYouAlive(message);
@@ -28,6 +28,5 @@ void TestService::execute(Message &message) {
 			break;
 		default:
 			ErrorHandler::reportInternalError(ErrorHandler::OtherMessageType);
-			break;
 	}
 }
diff --git a/src/Services/TimeBasedSchedulingService.cpp b/src/Services/TimeBasedSchedulingService.cpp
index 3a4b7838ffc3fa55d5d0854f49431ee8b71d8004..58f532ae60e92f7949d92364479b28c4bb47e0e2 100644
--- a/src/Services/TimeBasedSchedulingService.cpp
+++ b/src/Services/TimeBasedSchedulingService.cpp
@@ -282,7 +282,7 @@ void TimeBasedSchedulingService::summaryReportActivitiesByID(Message &request) {
 	storeMessage(report); // Save the report
 }
 
-void TimeBasedSchedulingService::execute(Message &message) {
+void TimeBasedSchedulingService::execute(Message& message) {
 	switch (message.messageType) {
 		case 1:
 			enableScheduleExecution(message); // TC[11,1]
@@ -316,6 +316,5 @@ void TimeBasedSchedulingService::execute(Message &message) {
 			break;
 		default:
 			ErrorHandler::reportInternalError(ErrorHandler::OtherMessageType);
-			break;
 	}
 }
diff --git a/src/Services/TimeManagementService.cpp b/src/Services/TimeManagementService.cpp
index 40c67c5f099b15b0d924d8cbc7710fb567bc52ae..93c224bbbd28ba8aa06ccc3d0257ac8e75a82e2c 100644
--- a/src/Services/TimeManagementService.cpp
+++ b/src/Services/TimeManagementService.cpp
@@ -26,13 +26,12 @@ TimeAndDate TimeManagementService::cdsTimeRequest(Message &message) {
 	return timeInfo;
 }
 
-void TimeManagementService::execute(Message &message) {
+void TimeManagementService::execute(Message& message) {
 	switch (message.messageType) {
 		case 128:
 			cdsTimeRequest(message); // TC[9,128]
 			break;
 		default:
 			ErrorHandler::reportInternalError(ErrorHandler::OtherMessageType);
-			break;
 	}
 }