diff --git a/algorithms_cpp/include/embb/algorithms/internal/merge_sort-inl.h b/algorithms_cpp/include/embb/algorithms/internal/merge_sort-inl.h
index af399c9..db0e7fe 100644
--- a/algorithms_cpp/include/embb/algorithms/internal/merge_sort-inl.h
+++ b/algorithms_cpp/include/embb/algorithms/internal/merge_sort-inl.h
@@ -171,7 +171,7 @@ void MergeSort(
   assert(distance >= 0);
 
   if (block_size == 0) {
-    block_size= (static_cast<size_t>(distance) / node.GetCoreCount());
+    block_size = (static_cast<size_t>(distance) / node.GetCoreCount());
     if (block_size == 0)
       block_size = 1;
   }
diff --git a/algorithms_cpp/include/embb/algorithms/internal/quick_sort-inl.h b/algorithms_cpp/include/embb/algorithms/internal/quick_sort-inl.h
index 47ef9ae..dc4f64a 100644
--- a/algorithms_cpp/include/embb/algorithms/internal/quick_sort-inl.h
+++ b/algorithms_cpp/include/embb/algorithms/internal/quick_sort-inl.h
@@ -195,7 +195,7 @@ void QuickSort(RAI first, RAI last, ComparisonFunction comparison,
   typename std::iterator_traits<RAI>::difference_type distance = last - first;
   assert(distance > 0);
   if (block_size == 0) {
-    block_size= (static_cast<size_t>(distance) / node.GetCoreCount());
+    block_size = (static_cast<size_t>(distance) / node.GetCoreCount());
     if (block_size == 0)
       block_size = 1;
   }
diff --git a/algorithms_cpp/test/count_test.cc b/algorithms_cpp/test/count_test.cc
index 7ded684..52754b2 100644
--- a/algorithms_cpp/test/count_test.cc
+++ b/algorithms_cpp/test/count_test.cc
@@ -59,7 +59,7 @@ CountTest::CountTest() {
 
 void CountTest::TestDataStructures() {
   using embb::algorithms::Count;
-  const int size =10;
+  const int size = 10;
   int array[] = {10, 20, 30, 30, 20, 10, 10, 20, 20, 20};
   std::vector<int> vector(array, array + size);
   std::deque<int> deque(array, array + size);
@@ -73,7 +73,7 @@ void CountTest::TestDataStructures() {
 
 void CountTest::TestCountIf() {
   using embb::algorithms::CountIf;
-  const int size =10;
+  const int size = 10;
   int array[] = {10, 21, 30, 31, 20, 11, 10, 21, 20, 20};
   PT_EXPECT_EQ(CountIf(array, array + size, IsEven()), 6);
   PT_EXPECT_EQ(CountIf(array, array + size, &IsEvenFunction), 6);
diff --git a/base_c/include/embb/base/c/internal/platform.h b/base_c/include/embb/base/c/internal/platform.h
index e7e3759..652aa62 100644
--- a/base_c/include/embb/base/c/internal/platform.h
+++ b/base_c/include/embb/base/c/internal/platform.h
@@ -105,4 +105,4 @@ typedef pthread_cond_t embb_condition_t;
 } /* Close extern "C" { */
 #endif
 
-#endif /* EMBB_BASE_C_INTERNAL_PLATFORM_H_ */
+#endif // EMBB_BASE_C_INTERNAL_PLATFORM_H_
diff --git a/base_c/test/alloc_test.h b/base_c/test/alloc_test.h
index 70488cc..cb61b65 100644
--- a/base_c/test/alloc_test.h
+++ b/base_c/test/alloc_test.h
@@ -81,4 +81,4 @@ class AllocTest : public partest::TestCase {
 } // namespace base
 } // namespace embb
 
-#endif /* BASE_C_TEST_ALLOC_TEST_H_ */
+#endif // BASE_C_TEST_ALLOC_TEST_H_
diff --git a/base_c/test/condition_var_test.h b/base_c/test/condition_var_test.h
index 3bf72d6..cb7fa20 100644
--- a/base_c/test/condition_var_test.h
+++ b/base_c/test/condition_var_test.h
@@ -65,4 +65,4 @@ class ConditionVarTest : public partest::TestCase {
 } // namespace base
 } // namespace embb
 
-#endif /* BASE_C_TEST_CONDITION_VAR_TEST_H_ */
+#endif // BASE_C_TEST_CONDITION_VAR_TEST_H_
diff --git a/base_c/test/core_set_test.h b/base_c/test/core_set_test.h
index 66b45f8..09284f5 100644
--- a/base_c/test/core_set_test.h
+++ b/base_c/test/core_set_test.h
@@ -51,4 +51,4 @@ class CoreSetTest : public partest::TestCase {
 } // namespace base
 } // namespace embb
 
-#endif /* BASE_C_TEST_CORE_SET_TEST_H_ */
+#endif // BASE_C_TEST_CORE_SET_TEST_H_
diff --git a/base_c/test/counter_test.h b/base_c/test/counter_test.h
index 679dc54..ccbdbf2 100644
--- a/base_c/test/counter_test.h
+++ b/base_c/test/counter_test.h
@@ -97,4 +97,4 @@ class CounterTest : public partest::TestCase {
 } // namespace base
 } // namespace embb
 
-#endif /* BASE_C_TEST_COUNTER_TEST_H_ */
+#endif // BASE_C_TEST_COUNTER_TEST_H_
diff --git a/base_c/test/duration_test.h b/base_c/test/duration_test.h
index f93ea98..98f610f 100644
--- a/base_c/test/duration_test.h
+++ b/base_c/test/duration_test.h
@@ -73,4 +73,4 @@ class DurationTest : public partest::TestCase {
 } // namespace base
 } // namespace embb
 
-#endif /* BASE_C_TEST_DURATION_TEST_H_ */
+#endif // BASE_C_TEST_DURATION_TEST_H_
diff --git a/base_c/test/thread_index_test.h b/base_c/test/thread_index_test.h
index f60691a..3129229 100644
--- a/base_c/test/thread_index_test.h
+++ b/base_c/test/thread_index_test.h
@@ -78,4 +78,4 @@ int ThreadStart(void* arg);
 
 
 
-#endif /* BASE_C_TEST_THREAD_INDEX_TEST_H_ */
+#endif // BASE_C_TEST_THREAD_INDEX_TEST_H_
diff --git a/base_c/test/thread_specific_storage_test.h b/base_c/test/thread_specific_storage_test.h
index 43a0697..1cc4f02 100644
--- a/base_c/test/thread_specific_storage_test.h
+++ b/base_c/test/thread_specific_storage_test.h
@@ -61,4 +61,4 @@ class ThreadSpecificStorageTest : public partest::TestCase {
 
 
 
-#endif /* BASE_C_TEST_THREAD_SPECIFIC_STORAGE_TEST_H_ */
+#endif // BASE_C_TEST_THREAD_SPECIFIC_STORAGE_TEST_H_
diff --git a/base_c/test/thread_test.h b/base_c/test/thread_test.h
index 69f94f9..4bed5cd 100644
--- a/base_c/test/thread_test.h
+++ b/base_c/test/thread_test.h
@@ -66,4 +66,4 @@ int ThreadStartFunction(void* arg);
 } // namespace base
 } // namespace embb
 
-#endif /* BASE_C_TEST_THREAD_TEST_H_ */
+#endif // BASE_C_TEST_THREAD_TEST_H_
\ No newline at end of file
diff --git a/base_c/test/time_test.h b/base_c/test/time_test.h
index 86f79d5..7beb815 100644
--- a/base_c/test/time_test.h
+++ b/base_c/test/time_test.h
@@ -53,4 +53,4 @@ class TimeTest : public partest::TestCase {
 
 
 
-#endif /* BASE_C_TEST_TIME_TEST_H_ */
+#endif // BASE_C_TEST_TIME_TEST_H_
diff --git a/base_cpp/include/embb/base/core_set.h b/base_cpp/include/embb/base/core_set.h
index 984f0f6..f757542 100644
--- a/base_cpp/include/embb/base/core_set.h
+++ b/base_cpp/include/embb/base/core_set.h
@@ -201,4 +201,4 @@ class CoreSet {
 
 
 
-#endif /* EMBB_BASE_CORE_SET_H_ */
+#endif // EMBB_BASE_CORE_SET_H_
diff --git a/base_cpp/include/embb/base/duration.h b/base_cpp/include/embb/base/duration.h
index ec64176..6d0f08a 100644
--- a/base_cpp/include/embb/base/duration.h
+++ b/base_cpp/include/embb/base/duration.h
@@ -522,4 +522,4 @@ class Nanoseconds : public Tick {
 
 #include <embb/base/internal/duration-inl.h>
 
-#endif /* EMBB_BASE_DURATION_H_ */
+#endif // EMBB_BASE_DURATION_H_
diff --git a/base_cpp/include/embb/base/exceptions.h b/base_cpp/include/embb/base/exceptions.h
index b3ce6b6..0d964ce 100644
--- a/base_cpp/include/embb/base/exceptions.h
+++ b/base_cpp/include/embb/base/exceptions.h
@@ -286,4 +286,4 @@ class ErrorException : public Exception {
 } // namespace base
 } // namespace embb
 
-#endif /* EMBB_BASE_EXCEPTIONS_H_ */
+#endif // EMBB_BASE_EXCEPTIONS_H_
diff --git a/base_cpp/include/embb/base/internal/duration-inl.h b/base_cpp/include/embb/base/internal/duration-inl.h
index 87f215d..f8bf53a 100644
--- a/base_cpp/include/embb/base/internal/duration-inl.h
+++ b/base_cpp/include/embb/base/internal/duration-inl.h
@@ -112,4 +112,4 @@ Duration<Tick>::Duration(const embb_duration_t& duration) : rep_() {
 } // namespace base
 } // namespace embb
 
-#endif /* EMBB_BASE_INTERNAL_DURATION_INL_H_ */
+#endif // EMBB_BASE_INTERNAL_DURATION_INL_H_
diff --git a/base_cpp/include/embb/base/internal/mutex-inl.h b/base_cpp/include/embb/base/internal/mutex-inl.h
index 3d07600..09ca12d 100644
--- a/base_cpp/include/embb/base/internal/mutex-inl.h
+++ b/base_cpp/include/embb/base/internal/mutex-inl.h
@@ -116,4 +116,4 @@ bool UniqueLock<Mutex>::OwnsLock() const {
 } // namespace base
 } // namespace embb
 
-#endif /* EMBB_BASE_INTERNAL_MUTEX_INL_H_ */
+#endif // EMBB_BASE_INTERNAL_MUTEX_INL_H_
diff --git a/base_cpp/include/embb/base/internal/thread-inl.h b/base_cpp/include/embb/base/internal/thread-inl.h
index a27fd01..ba5bc86 100644
--- a/base_cpp/include/embb/base/internal/thread-inl.h
+++ b/base_cpp/include/embb/base/internal/thread-inl.h
@@ -107,4 +107,4 @@ std::basic_ostream<CharT, Traits>&
 } // namespace base
 } // namespace embb
 
-#endif /* EMBB_BASE_INTERNAL_THREAD_INL_H_ */
+#endif // EMBB_BASE_INTERNAL_THREAD_INL_H_
diff --git a/base_cpp/include/embb/base/internal/thread_closures.h b/base_cpp/include/embb/base/internal/thread_closures.h
index b18a202..a71b4bf 100644
--- a/base_cpp/include/embb/base/internal/thread_closures.h
+++ b/base_cpp/include/embb/base/internal/thread_closures.h
@@ -103,4 +103,4 @@ struct ThreadClosureArg2 {
 } // namespace base
 } // namespace embb
 
-#endif /* EMBB_BASE_INTERNAL_THREAD_CLOSURES_H_ */
+#endif // EMBB_BASE_INTERNAL_THREAD_CLOSURES_H_
diff --git a/base_cpp/include/embb/base/internal/thread_specific_storage-inl.h b/base_cpp/include/embb/base/internal/thread_specific_storage-inl.h
index 0786c82..e66b5e3 100644
--- a/base_cpp/include/embb/base/internal/thread_specific_storage-inl.h
+++ b/base_cpp/include/embb/base/internal/thread_specific_storage-inl.h
@@ -149,4 +149,4 @@ void ThreadSpecificStorage<Type>::Prepare() {
 } // namespace base
 } // namespace embb
 
-#endif /* EMBB_BASE_INTERNAL_THREAD_SPECIFIC_STORAGE_INL_H_ */
+#endif // EMBB_BASE_INTERNAL_THREAD_SPECIFIC_STORAGE_INL_H_
diff --git a/base_cpp/include/embb/base/thread_specific_storage.h b/base_cpp/include/embb/base/thread_specific_storage.h
index d8e30d8..de5774e 100644
--- a/base_cpp/include/embb/base/thread_specific_storage.h
+++ b/base_cpp/include/embb/base/thread_specific_storage.h
@@ -35,10 +35,12 @@ namespace embb {
 namespace base {
 
 namespace test {
-  /**
-   * Forward declaration for friending.
-   */
-  class ThreadSpecificStorageTest;
+
+/**
+  * Forward declaration for friending.
+  */
+class ThreadSpecificStorageTest;
+
 }
 
 /**
@@ -176,4 +178,4 @@ class ThreadSpecificStorage {
 
 #include <embb/base/internal/thread_specific_storage-inl.h>
 
-#endif /* EMBB_BASE_THREAD_SPECIFIC_STORAGE_H_ */
+#endif // EMBB_BASE_THREAD_SPECIFIC_STORAGE_H_
diff --git a/base_cpp/include/embb/base/time.h b/base_cpp/include/embb/base/time.h
index e2e0927..b0e97cc 100644
--- a/base_cpp/include/embb/base/time.h
+++ b/base_cpp/include/embb/base/time.h
@@ -78,4 +78,4 @@ class Time {
 } // namespace base
 } // namespace embb
 
-#endif /* EMBB_BASE_TIME_H_ */
+#endif // EMBB_BASE_TIME_H_
diff --git a/base_cpp/test/thread_specific_storage_test.h b/base_cpp/test/thread_specific_storage_test.h
index 7de0332..1c94e2a 100644
--- a/base_cpp/test/thread_specific_storage_test.h
+++ b/base_cpp/test/thread_specific_storage_test.h
@@ -42,7 +42,7 @@ class ThreadSpecificStorageTest : public partest::TestCase {
   /**
    * Adds test units.
    */
-  explicit ThreadSpecificStorageTest();
+  ThreadSpecificStorageTest();
 
  private:
   /**
diff --git a/base_cpp/test/thread_test.h b/base_cpp/test/thread_test.h
index 0ae4bf8..638da88 100644
--- a/base_cpp/test/thread_test.h
+++ b/base_cpp/test/thread_test.h
@@ -43,7 +43,7 @@ class ThreadTest : public partest::TestCase {
   /**
    * Adds test methods.
    */
-  explicit ThreadTest(); /**<
+  ThreadTest(); /**<
       number of threads concurrently running test methods */
 
  private:
diff --git a/dataflow_cpp/include/embb/dataflow/internal/inputs.h b/dataflow_cpp/include/embb/dataflow/internal/inputs.h
index a118a1a..356911c 100644
--- a/dataflow_cpp/include/embb/dataflow/internal/inputs.h
+++ b/dataflow_cpp/include/embb/dataflow/internal/inputs.h
@@ -87,9 +87,10 @@ class Inputs<Slices, T1, embb::base::internal::Nil, embb::base::internal::Nil,
   }
   virtual void OnClock(int clock) {
     const int idx = clock % Slices;
-    if (count_[idx] == 0)
+    if (count_[idx] == 0) {
       EMBB_THROW(embb::base::ErrorException,
         "All inputs already fired for this clock.")
+    }
     if (--count_[idx] == 0) {
       count_[idx] = 1;
       listener_->OnClock(clock);
@@ -132,9 +133,10 @@ class Inputs<Slices, T1, T2, embb::base::internal::Nil,
   }
   virtual void OnClock(int clock) {
     const int idx = clock % Slices;
-    if (count_[idx] == 0)
+    if (count_[idx] == 0) {
       EMBB_THROW(embb::base::ErrorException,
         "All inputs already fired for this clock.")
+    }
     if (--count_[idx] == 0) {
       count_[idx] = 2;
       listener_->OnClock(clock);
@@ -181,10 +183,11 @@ class Inputs<Slices, T1, T2, T3, embb::base::internal::Nil,
   }
   virtual void OnClock(int clock) {
     const int idx = clock % Slices;
-    if (count_[idx] == 0)
+    if (count_[idx] == 0) {
       EMBB_THROW(embb::base::ErrorException,
         "All inputs already fired for this clock.")
-      if (--count_[idx] == 0) {
+    }
+    if (--count_[idx] == 0) {
       count_[idx] = 3;
       listener_->OnClock(clock);
     }
@@ -233,9 +236,10 @@ class Inputs<Slices, T1, T2, T3, T4, embb::base::internal::Nil>
   }
   virtual void OnClock(int clock) {
     const int idx = clock % Slices;
-    if (count_[idx] == 0)
+    if (count_[idx] == 0) {
       EMBB_THROW(embb::base::ErrorException,
         "All inputs already fired for this clock.")
+    }
     if (--count_[idx] == 0) {
       count_[idx] = 4;
       listener_->OnClock(clock);
@@ -290,9 +294,10 @@ class Inputs
   }
   virtual void OnClock(int clock) {
     const int idx = clock % Slices;
-    if (count_[idx] == 0)
+    if (count_[idx] == 0) {
       EMBB_THROW(embb::base::ErrorException,
         "All inputs already fired for this clock.")
+    }
     if (--count_[idx] == 0) {
       count_[idx] = 5;
       listener_->OnClock(clock);
diff --git a/mtapi_c/test/embb_mtapi_test_queue.cc b/mtapi_c/test/embb_mtapi_test_queue.cc
index 9bedc62..08a0933 100644
--- a/mtapi_c/test/embb_mtapi_test_queue.cc
+++ b/mtapi_c/test/embb_mtapi_test_queue.cc
@@ -52,7 +52,7 @@ static void testQueueAction(
   }
   embb_mtapi_log_info("testQueueAction %d called from worker %d...\n",
     workload_id, core_num);
-  EMBB_UNUSED_IN_RELEASE(workload_id);
+  EMBB_UNUSED(workload_id);
 }
 
 static void testDoSomethingElse() {
diff --git a/mtapi_c/test/embb_mtapi_test_task.cc b/mtapi_c/test/embb_mtapi_test_task.cc
index da0a42e..4b01445 100644
--- a/mtapi_c/test/embb_mtapi_test_task.cc
+++ b/mtapi_c/test/embb_mtapi_test_task.cc
@@ -50,7 +50,7 @@ static void testTaskAction(
   }
   embb_mtapi_log_info("testTaskAction %d called from worker %d...\n",
     *reinterpret_cast<const int*>(args), core_num);
-  EMBB_UNUSED_IN_RELEASE(args);
+  EMBB_UNUSED(args);
 }
 
 static void testDoSomethingElse() {