diff --git a/Rich/RichFutureDAQ/src/component/RichRawBankDecoder.cpp b/Rich/RichFutureDAQ/src/component/RichRawBankDecoder.cpp
index 62594187d05dcae38143e17db77fffde26cb4dc2..517bdc45702c9bd7ed5903d5492f18bbb83482b8 100644
--- a/Rich/RichFutureDAQ/src/component/RichRawBankDecoder.cpp
+++ b/Rich/RichFutureDAQ/src/component/RichRawBankDecoder.cpp
@@ -419,10 +419,11 @@ void RawBankDecoder::decodeToSmartIDs_MaPMT1( const LHCb::RawBank&      bank,
 
   // Validate the data sizes for each tel40 link extracted from the data
   // is in agreement with the overall bank size
-  if ( ( nPackedSizeW + nPayloadWords ) != bankSize ) {
+  const auto nTotalWords = nPackedSizeW + nPayloadWords;
+  if ( nTotalWords != bankSize ) {
     ++m_bankSizeMisMatchErr;
     std::ostringstream mess;
-    mess << "Tel40:" << tel40ID << " BankSize:" << bankSize << " != DecodedSize:" << ( nPackedSizeW + nPayloadWords );
+    mess << "Tel40:" << tel40ID << " BankSize:" << bankSize << " != DecodedSize:" << nTotalWords;
     throw Rich::Exception( mess.str() );
   }
 
@@ -801,9 +802,9 @@ void RawBankDecoder::dumpRawBank( const LHCb::RawBank& bank, MsgStream& os ) con
 
   // Is this an empty bank ?
   if ( bankSize > 0 ) {
-    using Dtype                     = std::uint8_t;
-    const unsigned int cli_rowwidth = 6;
-    std::size_t        iWord        = 0;
+    using Dtype                    = std::uint8_t;
+    const std::size_t cli_rowwidth = 6;
+    std::size_t       iWord        = 0;
     for ( const Dtype* dataW = bank.begin<Dtype>(); dataW != bank.end<Dtype>(); ++dataW ) {
       // start new line
       if ( iWord % cli_rowwidth == 0 ) {