diff --git a/src/lava/magma/runtime/message_infrastructure/message_infrastructure/csrc/core/message_infrastructure_logging.cc b/src/lava/magma/runtime/message_infrastructure/message_infrastructure/csrc/core/message_infrastructure_logging.cc
index 3e304f991..d33ca45cf 100644
--- a/src/lava/magma/runtime/message_infrastructure/message_infrastructure/csrc/core/message_infrastructure_logging.cc
+++ b/src/lava/magma/runtime/message_infrastructure/message_infrastructure/csrc/core/message_infrastructure_logging.cc
@@ -18,8 +18,7 @@ std::string GetTime() {
   timespec_get(&ts, TIME_UTC);
   int end = strftime(buf, sizeof(buf), "%Y-%m-%d.%X", gmtime(&ts.tv_sec));
   snprintf(buf + end, MAX_SIZE_LOG_TIME-end, " %09ld", ts.tv_nsec);
-  std::string ret = std::string(buf);
-  return ret;
+  return std::string(buf);
 }
 
 }  // namespace
@@ -61,7 +60,7 @@ MessageInfrastructureLog::MessageInfrastructureLog() {
 void MessageInfrastructureLog::LogWrite(const LogMsg& msg) {
   std::lock_guard<std::mutex> lg(log_lock_);
   log_queue_.push(msg);
-    if (log_queue_.size() == MAX_SIZE_LOG) {
+  if (log_queue_.size() == MAX_SIZE_LOG) {
       WriteDown();
   }
 }
diff --git a/src/lava/magma/runtime/message_infrastructure/message_infrastructure/csrc/core/message_infrastructure_logging.h b/src/lava/magma/runtime/message_infrastructure/message_infrastructure/csrc/core/message_infrastructure_logging.h
index 9500778c7..8c5fb542c 100644
--- a/src/lava/magma/runtime/message_infrastructure/message_infrastructure/csrc/core/message_infrastructure_logging.h
+++ b/src/lava/magma/runtime/message_infrastructure/message_infrastructure/csrc/core/message_infrastructure_logging.h
@@ -6,7 +6,7 @@
 #define CORE_MESSAGE_INFRASTRUCTURE_LOGGING_H_
 
 #include <memory>
-#include <mutex>
+#include <mutex> //NOLINT
 #include <iostream>
 #include <sstream>
 #include <fstream>