diff --git a/src/Services/RealTimeForwardingControlService.cpp b/src/Services/RealTimeForwardingControlService.cpp
index b1dba5112b9011c1a1662856a1c9e1e949eae217..315bfbe3e4dd11b979f95a240e90e8c75a813841 100644
--- a/src/Services/RealTimeForwardingControlService.cpp
+++ b/src/Services/RealTimeForwardingControlService.cpp
@@ -98,7 +98,7 @@ bool RealTimeForwardingControlService::checkMessage(Message& request, uint8_t ap
 bool RealTimeForwardingControlService::reportExistsInAppProcessConfiguration(uint8_t applicationID, uint8_t serviceType,
                                                                              uint8_t messageType) {
 	auto key = std::make_pair(applicationID, serviceType);
-    auto& messages = applicationProcessConfiguration.definitions[key];
+	auto& messages = applicationProcessConfiguration.definitions[key];
 	return std::find(messages.begin(), messages.end(), messageType) != messages.end();
 }
 
@@ -138,8 +138,8 @@ void RealTimeForwardingControlService::addReportTypesToAppProcessConfiguration(M
 				if (not checkMessage(request, applicationID, serviceType, messageType)) {
 					continue;
 				}
-				auto appServicePair = std::make_pair(applicationID, serviceType);
-				applicationProcessConfiguration.definitions[appServicePair].push_back(
+				auto key = std::make_pair(applicationID, serviceType);
+				applicationProcessConfiguration.definitions[key].push_back(
 				    messageType);
 			}
 		}