diff --git a/inc/Services/EventActionService.hpp b/inc/Services/EventActionService.hpp
index c2a8cd550b33392dfc5a10e9c74a3cc8830dbe72..890c7c07c012f216905ae8235deb964f94556e6b 100644
--- a/inc/Services/EventActionService.hpp
+++ b/inc/Services/EventActionService.hpp
@@ -56,7 +56,7 @@ public:
 	friend EventReportService;
 
 	etl::map<uint16_t, EventActionDefinition, ECSS_EVENT_ACTION_STRUCT_ARRAY_SIZE>
-	    eventActionDefinitionMap;
+		eventActionDefinitionMap;
 
 	EventActionService() {
 		serviceType = 19;
@@ -123,10 +123,9 @@ public:
 	 * Getter for event-action function status
 	 * @return eventActionFunctionStatus
 	 */
-	bool getEventActionFunctionStatus(){
+	bool getEventActionFunctionStatus() {
 		return eventActionFunctionStatus;
 	}
-
 };
 
 #endif //ECSS_SERVICES_EVENTACTIONSERVICE_HPP
diff --git a/src/Services/EventActionService.cpp b/src/Services/EventActionService.cpp
index c147456b5820fa16de49e395078d451bb2154f63..697e2f2b2fbb3611d99572e365fc6bc51c429e7c 100644
--- a/src/Services/EventActionService.cpp
+++ b/src/Services/EventActionService.cpp
@@ -29,8 +29,7 @@ void EventActionService::addEventActionDefinitions(Message &message) {
 			} else {
 				char data[ECSS_TC_REQUEST_STRING_SIZE];
 				message.readString(data, message.dataSize - 4);
-				eventActionDefinitionMap[eventDefinitionID].request =
-					String<ECSS_TC_REQUEST_STRING_SIZE>(data);
+				eventActionDefinitionMap[eventDefinitionID].request = String<ECSS_TC_REQUEST_STRING_SIZE>(data);
 			}
 		} else {
 			ErrorHandler::reportError(message, ErrorHandler::EventActionAddEnabledDefinitionError);
@@ -50,8 +49,7 @@ void EventActionService::deleteEventActionDefinitions(Message &message) {
 			// use it anywhere
 			eventActionDefinitionMap[eventDefinitionID].applicationId = applicationID;
 			if (eventActionDefinitionMap[eventDefinitionID].enabled == true) {
-				ErrorHandler::reportError(message,
-				                          ErrorHandler::EventActionDeleteEnabledDefinitionError);
+				ErrorHandler::reportError(message, ErrorHandler::EventActionDeleteEnabledDefinitionError);
 			} else {
 				eventActionDefinitionMap.erase(eventDefinitionID);
 			}
@@ -78,15 +76,13 @@ void EventActionService::enableEventActionDefinitions(Message &message) {
 		for (uint16_t i = 0; i < numberOfEventActionDefinitions; i++) {
 			uint16_t applicationID = message.readEnum16();
 			uint16_t eventDefinitionID = message.readEnum16();
-			if (eventActionDefinitionMap.find(eventDefinitionID) != eventActionDefinitionMap
-				.end()) {
+			if (eventActionDefinitionMap.find(eventDefinitionID) != eventActionDefinitionMap.end()) {
 				// This is need to pass the cpp check. The applicationId should be used
 				// somewhere
 				eventActionDefinitionMap[eventDefinitionID].applicationId = applicationID;
 				eventActionDefinitionMap[eventDefinitionID].enabled = true;
 			} else {
-				ErrorHandler::reportError(message,
-				                          ErrorHandler::EventActionUnknownDefinitionError);
+				ErrorHandler::reportError(message, ErrorHandler::EventActionUnknownDefinitionError);
 			}
 		}
 	} else {
@@ -113,8 +109,7 @@ void EventActionService::disableEventActionDefinitions(Message &message) {
 				eventActionDefinitionMap[eventDefinitionID].applicationId = applicationID;
 				eventActionDefinitionMap[eventDefinitionID].enabled = false;
 			} else {
-				ErrorHandler::reportError(message,
-				                          ErrorHandler::EventActionUnknownDefinitionError);
+				ErrorHandler::reportError(message, ErrorHandler::EventActionUnknownDefinitionError);
 			}
 		}
 	} else {