diff --git a/inc/Services/RequestVerificationService.hpp b/inc/Services/RequestVerificationService.hpp
index fc69b08b948fd831fc00e3187f373ffab1a7d5cd..b322cd0c545f8cd9da55930f929731994303e49e 100644
--- a/inc/Services/RequestVerificationService.hpp
+++ b/inc/Services/RequestVerificationService.hpp
@@ -1,4 +1,3 @@
-
 #ifndef ECSS_SERVICES_REQUSTVERIFICATIONSERVICE_HPP
 #define ECSS_SERVICES_REQUESTVERIFICATIONSERVICE_HPP
 
diff --git a/src/Services/RequestVerificationService.cpp b/src/Services/RequestVerificationService.cpp
index 00ca89d9c4d52b58c46a72cbeef479afab68d1a5..df38a9c9850b9ebb26f86d29fc4e54f7dfb8c594 100644
--- a/src/Services/RequestVerificationService.cpp
+++ b/src/Services/RequestVerificationService.cpp
@@ -14,7 +14,7 @@ void RequestVerificationService::successAcceptanceVerification(uint8_t packetTyp
 
 	report.appendBits(3, ECSS_PUS_VERSION); //packet version number
 	report.appendBits(1, packetType);
-	report.appendBits(1, (uint16_t) secondaryHeaderFlag);
+	report.appendBits(1, static_cast<uint16_t >(secondaryHeaderFlag));
 	report.appendBits(11, APID);
 	report.appendBits(2, seqFlag);
 	report.appendBits(14, packetSeqCount);
@@ -38,7 +38,7 @@ RequestVerificationService::failAcceptanceVerification(uint8_t packetType,
 
 	report.appendBits(3, ECSS_PUS_VERSION); //packet version number
 	report.appendBits(1, packetType);
-	report.appendBits(1, (uint16_t) secondaryHeaderFlag);
+	report.appendBits(1, static_cast<uint16_t >(secondaryHeaderFlag));
 	report.appendBits(11, APID);
 	report.appendBits(2, seqFlag);
 	report.appendBits(14, packetSeqCount);
@@ -62,7 +62,7 @@ void RequestVerificationService::successExecutionVerification(uint8_t packetType
 
 	report.appendBits(3, ECSS_PUS_VERSION); //packet version number
 	report.appendBits(1, packetType);
-	report.appendBits(1, (uint16_t) secondaryHeaderFlag);
+	report.appendBits(1, static_cast<uint16_t >(secondaryHeaderFlag));
 	report.appendBits(11, APID);
 	report.appendBits(2, seqFlag);
 	report.appendBits(14, packetSeqCount);
@@ -86,7 +86,7 @@ RequestVerificationService::failExecutionVerification(uint8_t packetType,
 
 	report.appendBits(3, ECSS_PUS_VERSION); //packet version number
 	report.appendBits(1, packetType);
-	report.appendBits(1, (uint16_t) secondaryHeaderFlag);
+	report.appendBits(1, static_cast<uint16_t >(secondaryHeaderFlag));
 	report.appendBits(11, APID);
 	report.appendBits(2, seqFlag);
 	report.appendBits(14, packetSeqCount);
@@ -112,7 +112,7 @@ RequestVerificationService::failRoutingVerification(uint8_t packetType,
 
 	report.appendBits(3, ECSS_PUS_VERSION); //packet version number
 	report.appendBits(1, packetType);
-	report.appendBits(1, (uint16_t) secondaryHeaderFlag);
+	report.appendBits(1, static_cast<uint16_t >(secondaryHeaderFlag));
 	report.appendBits(11, APID);
 	report.appendBits(2, seqFlag);
 	report.appendBits(14, packetSeqCount);
diff --git a/src/main.cpp b/src/main.cpp
index a80938a5fc9881ee4f50b2bbb02b283b7edc8200..176f1feebd258a65676ba442251eebca63e3896b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -32,16 +32,11 @@ int main() {
 	// ST[01] test
 	// parameters take random values and works as expected
 	RequestVerificationService reqVerifService;
-	receivedPacket = Message(1, 1, Message::TC, 2);
-	reqVerifService.successAcceptanceVerification(0, (uint8_t )1, 2, 2, 10);
-	receivedPacket = Message(1, 2, Message::TC, 2);
-	reqVerifService.failAcceptanceVerification(0, (uint8_t )1, 2, 2, 10, 5);
-	receivedPacket = Message(1, 7, Message::TC, 2);
-	reqVerifService.successExecutionVerification(0, (uint8_t )1, 2, 2, 10);
-	receivedPacket = Message(1, 8, Message::TC, 2);
-	reqVerifService.failExecutionVerification(0, (uint8_t )1, 2, 2, 10, 6);
-	receivedPacket = Message(1, 10, Message::TC, 2);
-	reqVerifService.failRoutingVerification(0, (uint8_t )1, 2, 2, 10, 7);
+	reqVerifService.successAcceptanceVerification(0, static_cast<uint8_t>(1), 2, 2, 10);
+	reqVerifService.failAcceptanceVerification(0, static_cast<uint8_t>(1), 2, 2, 10, 5);
+	reqVerifService.successExecutionVerification(0, static_cast<uint8_t>(1), 2, 2, 10);
+	reqVerifService.failExecutionVerification(0, static_cast<uint8_t>(1), 2, 2, 10, 6);
+	reqVerifService.failRoutingVerification(0, static_cast<uint8_t>(1), 2, 2, 10, 7);
 
 	return 0;
 }