diff --git a/tmtcservices/TmTcBridge.cpp b/tmtcservices/TmTcBridge.cpp
index c984a6a8..c41e790c 100644
--- a/tmtcservices/TmTcBridge.cpp
+++ b/tmtcservices/TmTcBridge.cpp
@@ -15,8 +15,8 @@ TmTcBridge::TmTcBridge(object_id_t objectId_,
         object_id_t ccsdsPacketDistributor_): SystemObject(objectId_),
         ccsdsPacketDistributor(ccsdsPacketDistributor_)
 {
-	    TmTcReceptionQueue = QueueFactory::instance()->
-	            createMessageQueue(TMTC_RECEPTION_QUEUE_DEPTH);
+	    TmTcReceptionQueue = QueueFactory::instance()->
+	            createMessageQueue(TMTC_RECEPTION_QUEUE_DEPTH);
 }
 
 TmTcBridge::~TmTcBridge() {}
@@ -73,8 +73,8 @@ ReturnValue_t TmTcBridge::handleTm() {
 
 ReturnValue_t TmTcBridge::readTmQueue() {
 	TmTcMessage message;
-	const uint8_t* data = nullptr;
-	size_t size = 0;
+	const uint8_t* data = nullptr;
+	size_t size = 0;
 	for (ReturnValue_t result = TmTcReceptionQueue->receiveMessage(&message);
 		 result == RETURN_OK; result = TmTcReceptionQueue->receiveMessage(&message))
 	{
@@ -124,8 +124,8 @@ ReturnValue_t TmTcBridge::sendStoredTm() {
 		info << "TMTC Bridge: Sending stored TM data. There are "
 		     << (int) fifo.size() << " left to send\r\n" << std::flush;
 		store_address_t storeId;
-		const uint8_t* data = NULL;
-		size_t size = 0;
+		const uint8_t* data = NULL;
+		size_t size = 0;
 		fifo.retrieve(&storeId);
 		result = tmStore->getData(storeId, &data, &size);
 		sendTm(data,size);