diff --git a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawContByteStreamCnv.cxx b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawContByteStreamCnv.cxx
index 7cb06b753bc1b4da8a10cd0ed52c82a8b70dcca4..4690f307e95449428768c8f8d00861e0a5cfcf46 100644
--- a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawContByteStreamCnv.cxx
+++ b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawContByteStreamCnv.cxx
@@ -53,7 +53,7 @@ StatusCode SCTRawContByteStreamCnv::createRep(DataObject* pDataObject, IOpaqueAd
   // Get IDC for SCT Raw Data
   SCT_RDO_Container* sctRDOCont{nullptr};
   StoreGateSvc::fromStorable(pDataObject, sctRDOCont);
-  if (sctRDOCont==nullptr) {
+  if (sctRDOCont == nullptr) {
     m_log << MSG::ERROR << " Can not cast to SCTRawContainer " << endmsg;
     return StatusCode::FAILURE;
   }
diff --git a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawDataProvider.cxx b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawDataProvider.cxx
index e40f407790172dbb6b93766fc2bf3dd32295d663..b42a20262d851804e8c6a5a63e44622464a61083 100644
--- a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawDataProvider.cxx
+++ b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawDataProvider.cxx
@@ -69,7 +69,7 @@ StatusCode SCTRawDataProvider::execute()
 
   SG::WriteHandle<SCT_RDO_Container> rdoContainer(m_rdoContainerKey);
   bool externalCacheRDO = !m_rdoContainerCacheKey.key().empty();
-  if (!externalCacheRDO) {
+  if (not externalCacheRDO) {
     ATH_CHECK(rdoContainer.record (std::make_unique<SCT_RDO_Container>(m_sctID->wafer_hash_max())));
     ATH_MSG_DEBUG("Created container for " << m_sctID->wafer_hash_max());
   }
diff --git a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawDataProviderTool.cxx b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawDataProviderTool.cxx
index 229aa7456d12df6f8fe67a752dc5a9e39652ef84..7b53401825cf5e3b2bdc271b616d3e19d8da59d9 100644
--- a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawDataProviderTool.cxx
+++ b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawDataProviderTool.cxx
@@ -66,7 +66,7 @@ StatusCode SCTRawDataProviderTool::convert(std::vector<const ROBFragment*>& vecR
     tmpROBIDSet.insert(robid);
 
     sc = m_decoder->fillCollection(*robFrag, rdoIDCont, errs, bsFracCont);
-    if (sc==StatusCode::FAILURE) {
+    if (sc == StatusCode::FAILURE) {
       if (m_decodeErrCount <= 100) {
         if (100 == m_decodeErrCount) {
           ATH_MSG_ERROR("Too many Problem with SCT Decoding messages, turning message off.");
@@ -83,7 +83,7 @@ StatusCode SCTRawDataProviderTool::convert(std::vector<const ROBFragment*>& vecR
   m_robIDSet.insert(tmpROBIDSet.begin(), tmpROBIDSet.end());
   m_mutex.unlock();
 
-  if (sc==StatusCode::FAILURE) {
+  if (sc == StatusCode::FAILURE) {
     ATH_MSG_ERROR("There was a problem with SCT ByteStream conversion");
     return sc;
   }
diff --git a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCT_RodEncoder.cxx b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCT_RodEncoder.cxx
index 8168b572193d58d53b43eee976b63bee5b09faef..f0308405fe4f5c4f594460f9e67a5a5940b15613 100644
--- a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCT_RodEncoder.cxx
+++ b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCT_RodEncoder.cxx
@@ -125,7 +125,7 @@ void SCT_RodEncoder::fillROD(std::vector<uint32_t>& vec32Data, const uint32_t& r
   // Loop over RDOs to check for duplicates and fill vec_isDuplicated vector
   for (unsigned int iRDO1{0}; iRDO1<vecRDOs.size(); iRDO1++) {
     const SCT_RDORawData* rdo1{vecRDOs.at(iRDO1)};
-    if (rdo1==nullptr) {
+    if (rdo1 == nullptr) {
       ATH_MSG_ERROR("RDO pointer is NULL. skipping this hit.");
       vec_isDuplicated.at(iRDO1) = true;
       continue;
@@ -136,9 +136,9 @@ void SCT_RodEncoder::fillROD(std::vector<uint32_t>& vec32Data, const uint32_t& r
       const SCT_RDORawData* rdo2{vecRDOs.at(iRDO2)};
       if (vec_isDuplicated.at(iRDO2)) continue;
 
-      if (rdo1->identify()==rdo2->identify()) {
+      if (rdo1->identify() == rdo2->identify()) {
         // Keep RDO with larger cluster size. If cluster sizes are the same, keep the first one.
-        if (rdo1->getGroupSize()>=rdo2->getGroupSize()) {
+        if (rdo1->getGroupSize() >= rdo2->getGroupSize()) {
           vec_isDuplicated.at(iRDO2) = true;
         } 
         else {
@@ -165,7 +165,7 @@ void SCT_RodEncoder::fillROD(std::vector<uint32_t>& vec32Data, const uint32_t& r
 
     const uint16_t header{this->getHeaderUsingRDO(rdo)};
     if (header != lastHeader) {
-      if (!firstInROD) {
+      if (not firstInROD) {
         vec16Data.push_back(lastTrailer);
       }
       firstInROD = false;
@@ -188,9 +188,9 @@ void SCT_RodEncoder::fillROD(std::vector<uint32_t>& vec32Data, const uint32_t& r
 
         for (int chip{chipFirst}; chip<=chipLast; chip++) {
           int tmpGroupSize = 0;
-          if (chipFirst==chipLast) tmpGroupSize = groupSize; // In case of one chip
-          else if (chip==chipLast) tmpGroupSize = strip+groupSize-chip*128; // In case of last chip
-          else if (chip==chipFirst) tmpGroupSize = (chip+1)*128-strip; // In case of first chip
+          if (chipFirst == chipLast) tmpGroupSize = groupSize; // In case of one chip
+          else if (chip == chipLast) tmpGroupSize = strip+groupSize-chip*128; // In case of last chip
+          else if (chip == chipFirst) tmpGroupSize = (chip+1)*128-strip; // In case of first chip
           else tmpGroupSize = 128; // In case of middle chip
           const int tmpStrip1{chip==chipFirst ? strip : 128*chip};
 
@@ -228,7 +228,7 @@ void SCT_RodEncoder::fillROD(std::vector<uint32_t>& vec32Data, const uint32_t& r
     }  // End of Expanded mode
   } // End of RDO decode loop
 
-  if (!firstInROD and lastTrailer!=0) {
+  if ((not firstInROD) and (lastTrailer != 0)) {
     vec16Data.push_back(lastTrailer);
   }
   
@@ -247,7 +247,7 @@ void SCT_RodEncoder::encodeData(const std::vector<int>& vecTimeBins, std::vector
   
   const Identifier idColl{offlineID(rdo)};
   int tmpStrip{strip};
-  if (m_swapModuleID.find(idColl)!= m_swapModuleID.end()) { // Check if the strip has to be swapped (swap phi readout direction)
+  if (m_swapModuleID.find(idColl) != m_swapModuleID.end()) { // Check if the strip has to be swapped (swap phi readout direction)
     tmpStrip= 767 - tmpStrip;
     tmpStrip= tmpStrip-(groupSize-1);
   }
@@ -290,7 +290,7 @@ void SCT_RodEncoder::encodeData(const std::vector<int>& vecTimeBins, std::vector
       vec16Words.push_back(hitExpEven);
     }
     // Last bin of the Odd next hits
-    if ((not vecTimeBins.empty() ) and isEven(vecTimeBins.size())) {
+    if ((not vecTimeBins.empty()) and isEven(vecTimeBins.size())) {
       const uint16_t hitExpLast{static_cast<uint16_t>(0x8008 | (vecTimeBins[vecTimeBins.size()-1] & 0xF))};
       vec16Words.push_back(hitExpLast);
     }