diff --git a/.clang-format b/.clang-format
index 9243c9a2b21..0f20ca442ce 100644
--- a/.clang-format
+++ b/.clang-format
@@ -21,6 +21,7 @@ BinPackArguments: true
 BinPackParameters: true
 BraceWrapping:
   AfterClass:             true
+  AfterCaseLabel:         true
   AfterControlStatement:  true
   AfterEnum:              true
   AfterFunction:          true
diff --git a/.github/workflows/check-format.yml b/.github/workflows/check-format.yml
index dcfb8d5e886..6aa7cebb7ca 100644
--- a/.github/workflows/check-format.yml
+++ b/.github/workflows/check-format.yml
@@ -28,11 +28,14 @@ jobs:
         with:
           python-version: '3.x'
 
-      # C format: clang-format-8
+      # C format: clang-format-16
       # Python format: yapf==0.22.0
       - name: Install packages
         run: |
-          sudo apt-get install -y clang-format-8
+          sudo apt-get install -y gnupg2 software-properties-common
+          wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
+          sudo add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-16 main"
+          sudo apt-get update && sudo apt-get install -qqy clang-format-16
           python -m pip install --upgrade pip
           pip install yapf==0.22.0
 
diff --git a/compiler/circle-opselector/src/OpSelector.cpp b/compiler/circle-opselector/src/OpSelector.cpp
index a7c3396ceca..f0cd0542bcc 100644
--- a/compiler/circle-opselector/src/OpSelector.cpp
+++ b/compiler/circle-opselector/src/OpSelector.cpp
@@ -68,7 +68,7 @@ bool is_number(const std::vector<std::string> &vec)
 {
   for (const auto &s : vec)
   {
-    if (not::is_number(s))
+    if (not ::is_number(s))
     {
       return false;
     }
@@ -270,7 +270,7 @@ OpSelector::select_by<SelectType::ID>(const std::vector<std::string> &comma_toke
   for (const auto &comma_token : comma_tokens)
   {
     auto dash_tokens = ::split_into_vector(comma_token, '-');
-    if (not::is_number(dash_tokens))
+    if (not ::is_number(dash_tokens))
     {
       throw std::runtime_error{
         "ERROR: To select operator by id, please use these args: [0-9], '-', ','"};
diff --git a/compiler/loco/include/loco/IR/NodePool.h b/compiler/loco/include/loco/IR/NodePool.h
index 4db4caae376..77823c5a583 100644
--- a/compiler/loco/include/loco/IR/NodePool.h
+++ b/compiler/loco/include/loco/IR/NodePool.h
@@ -34,7 +34,7 @@ class NodePool final : public ObjectPool<Node>
   ~NodePool();
 
 public:
-  template <typename Derived, typename... Args> Derived *create(Args &&... args)
+  template <typename Derived, typename... Args> Derived *create(Args &&...args)
   {
     std::unique_ptr<Derived> ptr{new Derived(std::forward<Args>(args)...)};
     ptr->graph(_graph);
diff --git a/compiler/loco/src/IR/MockupNode.h b/compiler/loco/src/IR/MockupNode.h
index 16eaccf3624..45a231d30ab 100644
--- a/compiler/loco/src/IR/MockupNode.h
+++ b/compiler/loco/src/IR/MockupNode.h
@@ -46,7 +46,7 @@ class MockupNode final : public loco::Node
   Node *arg(uint32_t N) const final { return _arg.node(); }
   void drop(void) final { _arg.node(nullptr); }
 
-  Node *in(void)const { return _arg.node(); }
+  Node *in(void) const { return _arg.node(); }
   void in(Node *node) { _arg.node(node); }
 
 private:
diff --git a/compiler/loco/src/Service/GraphBuilder.h b/compiler/loco/src/Service/GraphBuilder.h
index 74eed2af80b..f3015205cce 100644
--- a/compiler/loco/src/Service/GraphBuilder.h
+++ b/compiler/loco/src/Service/GraphBuilder.h
@@ -87,7 +87,7 @@ class GraphBuilder final
 public:
   // "Layer" is in theory a subgraph builder.
   template <typename Layer, typename... Args>
-  auto push(Args &&... args)
+  auto push(Args &&...args)
     -> decltype(static_cast<Layer *>(nullptr)->operator()(static_cast<Context *>(nullptr)))
   {
     Layer layer{std::forward<Args>(args)...};
diff --git a/compiler/luci-interpreter/src/loader/KernelBuilder.test.cpp b/compiler/luci-interpreter/src/loader/KernelBuilder.test.cpp
index 135800fc790..128d1a43a31 100644
--- a/compiler/luci-interpreter/src/loader/KernelBuilder.test.cpp
+++ b/compiler/luci-interpreter/src/loader/KernelBuilder.test.cpp
@@ -103,7 +103,7 @@ class KernelBuilderTest : public Test
 
   std::unique_ptr<IMemoryManager> _memory_manager;
 
-  template <typename NodeT, typename... Args> NodeT *createNode(Args &&... args)
+  template <typename NodeT, typename... Args> NodeT *createNode(Args &&...args)
   {
     auto *node = _graph.nodes()->create<NodeT>(std::forward<Args>(args)...);
     // The actual type does not matter for the purpose of the tests.
diff --git a/compiler/luci/lang/include/luci/IR/SparsityParam.h b/compiler/luci/lang/include/luci/IR/SparsityParam.h
index 6cfff67e1d9..15ddeb17cff 100644
--- a/compiler/luci/lang/include/luci/IR/SparsityParam.h
+++ b/compiler/luci/lang/include/luci/IR/SparsityParam.h
@@ -202,8 +202,8 @@ class DimMetaData
   }
   DimMetaData(DimensionType format, int32_t dense_size, const SparseIndexVector &array_segments,
               const SparseIndexVector &array_indices)
-    : _format{format}, _dense_size{dense_size}, _array_segments{array_segments}, _array_indices{
-                                                                                   array_indices}
+    : _format{format}, _dense_size{dense_size}, _array_segments{array_segments},
+      _array_indices{array_indices}
   {
     // DO NOTHING
   }
diff --git a/compiler/luci/pass/include/luci/CircleQuantizer.h b/compiler/luci/pass/include/luci/CircleQuantizer.h
index ae3ab6ff109..a326c983685 100644
--- a/compiler/luci/pass/include/luci/CircleQuantizer.h
+++ b/compiler/luci/pass/include/luci/CircleQuantizer.h
@@ -47,7 +47,7 @@ class CircleQuantizer final
     public:
       // some helper methods
       size_t size(void) const { return items.size(); }
-      template <class... Args> void emplace_back(Args &&... args) { items.emplace_back(args...); }
+      template <class... Args> void emplace_back(Args &&...args) { items.emplace_back(args...); }
       std::vector<LayerParams>::iterator begin() { return items.begin(); };
       std::vector<LayerParams>::iterator end() { return items.end(); };
 
diff --git a/compiler/mir-interpreter/src/ops/Common.h b/compiler/mir-interpreter/src/ops/Common.h
index 43336216e0d..f7edf44ab32 100644
--- a/compiler/mir-interpreter/src/ops/Common.h
+++ b/compiler/mir-interpreter/src/ops/Common.h
@@ -27,7 +27,7 @@ namespace mir_interpreter
 {
 
 template <template <typename> class F, typename... Args>
-void dispatch(mir::DataType dt, Args &&... args)
+void dispatch(mir::DataType dt, Args &&...args)
 {
   switch (dt)
   {
diff --git a/compiler/mir/include/mir/Graph.h b/compiler/mir/include/mir/Graph.h
index 37bfdb3614c..48a4825c130 100644
--- a/compiler/mir/include/mir/Graph.h
+++ b/compiler/mir/include/mir/Graph.h
@@ -38,7 +38,7 @@ class Graph
 
   virtual ~Graph();
 
-  template <typename T, typename... Args> Operation *create(Args &&... args)
+  template <typename T, typename... Args> Operation *create(Args &&...args)
   {
     auto op = new T(std::forward<Args>(args)...);
     op->setId(_last_node_id++);
diff --git a/compiler/mir/src/mir_caffe2_importer/caffe2_op_creator.h b/compiler/mir/src/mir_caffe2_importer/caffe2_op_creator.h
index 2b29378e9ea..025cb54ab98 100644
--- a/compiler/mir/src/mir_caffe2_importer/caffe2_op_creator.h
+++ b/compiler/mir/src/mir_caffe2_importer/caffe2_op_creator.h
@@ -103,11 +103,11 @@ class Caffe2OpCreator
 private:
   mir::Graph *_graph = nullptr;
 
-  template <typename OpType, typename... Types> mir::Operation *createOp(Types &&... args);
+  template <typename OpType, typename... Types> mir::Operation *createOp(Types &&...args);
 };
 
 template <typename OpType, typename... Types>
-mir::Operation *Caffe2OpCreator::createOp(Types &&... args)
+mir::Operation *Caffe2OpCreator::createOp(Types &&...args)
 {
   return _graph->create<OpType>(std::forward<Types>(args)...);
 }
diff --git a/compiler/mir/src/mir_caffe_importer/caffe_op_creator.h b/compiler/mir/src/mir_caffe_importer/caffe_op_creator.h
index 721bb90b8a0..11a4dfc8dd8 100644
--- a/compiler/mir/src/mir_caffe_importer/caffe_op_creator.h
+++ b/compiler/mir/src/mir_caffe_importer/caffe_op_creator.h
@@ -132,11 +132,11 @@ class CaffeOpCreator
 
   mir::TensorVariant convertBlob(const caffe::BlobProto &blob);
 
-  template <typename OpType, typename... Types> mir::Operation *createOp(Types &&... args);
+  template <typename OpType, typename... Types> mir::Operation *createOp(Types &&...args);
 };
 
 template <typename OpType, typename... Types>
-mir::Operation *CaffeOpCreator::createOp(Types &&... args)
+mir::Operation *CaffeOpCreator::createOp(Types &&...args)
 {
   return _graph->create<OpType>(std::forward<Types>(args)...);
 }
diff --git a/compiler/mir/src/mir_onnx_importer/ONNXHelpers.h b/compiler/mir/src/mir_onnx_importer/ONNXHelpers.h
index 1367ab82ab8..3b644ca5d08 100644
--- a/compiler/mir/src/mir_onnx_importer/ONNXHelpers.h
+++ b/compiler/mir/src/mir_onnx_importer/ONNXHelpers.h
@@ -38,7 +38,7 @@ mir::TensorVariant createTensor(const onnx::TensorProto *tensor);
 mir::Operation *foldConstants(mir::Graph *graph, mir::Operation *op);
 
 template <typename OpType, typename... Types>
-mir::Operation *createOp(mir::Graph *graph, Types &&... args)
+mir::Operation *createOp(mir::Graph *graph, Types &&...args)
 {
   auto op = graph->create<OpType>(std::forward<Types>(args)...);
   op = foldConstants(graph, op);
diff --git a/compiler/mir/src/mir_tflite_importer/tflite_op_creator.h b/compiler/mir/src/mir_tflite_importer/tflite_op_creator.h
index 820436f3359..c5bc4f69fad 100644
--- a/compiler/mir/src/mir_tflite_importer/tflite_op_creator.h
+++ b/compiler/mir/src/mir_tflite_importer/tflite_op_creator.h
@@ -149,11 +149,11 @@ class TFLiteOpCreator
   mir::Operation::Output *addFusedActivation(mir::Operation::Output *input,
                                              tflite::ActivationFunctionType activation_type);
 
-  template <typename OpType, typename... Types> mir::Operation *createOp(Types &&... args);
+  template <typename OpType, typename... Types> mir::Operation *createOp(Types &&...args);
 };
 
 template <typename OpType, typename... Types>
-mir::Operation *TFLiteOpCreator::createOp(Types &&... args)
+mir::Operation *TFLiteOpCreator::createOp(Types &&...args)
 {
   return _graph->create<OpType>(std::forward<Types>(args)...);
 }
diff --git a/compiler/mir/unittests/ShapeRange.cpp b/compiler/mir/unittests/ShapeRange.cpp
index 91b1be74415..d3d33b1dcb8 100644
--- a/compiler/mir/unittests/ShapeRange.cpp
+++ b/compiler/mir/unittests/ShapeRange.cpp
@@ -28,7 +28,7 @@ struct ParamType
   Shape shape;
 
   template <typename... Args>
-  explicit ParamType(int32_t actual_len, Args &&... args)
+  explicit ParamType(int32_t actual_len, Args &&...args)
     : actual_length(actual_len), shape({static_cast<int32_t>(args)...})
   {
   }
diff --git a/compiler/nest/core/include/nest/Closure.h b/compiler/nest/core/include/nest/Closure.h
index 7e09afa1a3b..8987755b0d2 100644
--- a/compiler/nest/core/include/nest/Closure.h
+++ b/compiler/nest/core/include/nest/Closure.h
@@ -27,7 +27,7 @@ class Closure
 {
 public:
   template <typename... Args>
-  Closure(const DomainID &id, Args &&... indices) : _id{id}, _sub{std::forward<Args>(indices)...}
+  Closure(const DomainID &id, Args &&...indices) : _id{id}, _sub{std::forward<Args>(indices)...}
   {
     // DO NOTHING
   }
diff --git a/compiler/nest/core/include/nest/Domain.h b/compiler/nest/core/include/nest/Domain.h
index 8d809e2ad23..8c497b6c109 100644
--- a/compiler/nest/core/include/nest/Domain.h
+++ b/compiler/nest/core/include/nest/Domain.h
@@ -37,7 +37,7 @@ class Domain
   Domain(const Domain &) = default;
 
 public:
-  template <typename... Args> Closure operator()(Args &&... indices)
+  template <typename... Args> Closure operator()(Args &&...indices)
   {
     return Closure{_id, std::forward<Args>(indices)...};
   }
diff --git a/compiler/nest/core/include/nest/expr/DerefNode.h b/compiler/nest/core/include/nest/expr/DerefNode.h
index 8e3cc569083..10809189100 100644
--- a/compiler/nest/core/include/nest/expr/DerefNode.h
+++ b/compiler/nest/core/include/nest/expr/DerefNode.h
@@ -30,8 +30,7 @@ class DerefNode final : public Node
 {
 public:
   template <typename... Args>
-  DerefNode(const DomainID &id, Args &&... indicies)
-    : _id{id}, _sub{std::forward<Args>(indicies)...}
+  DerefNode(const DomainID &id, Args &&...indicies) : _id{id}, _sub{std::forward<Args>(indicies)...}
   {
     // DO NOTHING
   }
diff --git a/compiler/nnc/unittests/soft_backend/CPPOperations.cpp b/compiler/nnc/unittests/soft_backend/CPPOperations.cpp
index e593333fa6d..cf5d0acc4b6 100644
--- a/compiler/nnc/unittests/soft_backend/CPPOperations.cpp
+++ b/compiler/nnc/unittests/soft_backend/CPPOperations.cpp
@@ -228,7 +228,7 @@ mir::TensorVariant getReferenceTensor(mir::Graph &g, mir::Operation *op)
  * @brief Run selected operation, used to make code in tests more compact and fit getReferenceTensor
  * format
  */
-template <typename Operation, typename... Args> Tensor run(Operation op, const Args &... args)
+template <typename Operation, typename... Args> Tensor run(Operation op, const Args &...args)
 {
   Tensor output;
   op(output, args...);
@@ -308,7 +308,7 @@ void createAndRunTestGraph(
   function<mir::Operation *(mir::Graph &, const std::vector<mir::Operation::Output *> &inputs)>
     op_generator,
   TestFunc artifactOperation, const vector<unique_ptr<mir::TensorVariant>> &input_ntensors,
-  Args &... input_atensors)
+  Args &...input_atensors)
 {
   mir::Graph g;
   mir::Operation *actual_operation = fillGraph(g, op_generator, input_ntensors);
diff --git a/compiler/nnsuite/conv/nnkit-caffe/ConvBackend.test.cpp b/compiler/nnsuite/conv/nnkit-caffe/ConvBackend.test.cpp
index 20c42385aab..d5471c6cc91 100644
--- a/compiler/nnsuite/conv/nnkit-caffe/ConvBackend.test.cpp
+++ b/compiler/nnsuite/conv/nnkit-caffe/ConvBackend.test.cpp
@@ -35,8 +35,8 @@ class TestModel : public nnsuite::conv::Model
   TestModel(const std::string &ifm_name, const feature::Shape &ifm_shape,
             const std::string &ofm_name, const feature::Shape &ofm_shape,
             const kernel::Shape &ker_shape, const kernel::Layout &ker_layout, float *ker_data)
-    : _ifm_name(ifm_name), _ifm_shape(ifm_shape), _ofm_name(ofm_name),
-      _ofm_shape(ofm_shape), _ker{ker_shape, ker_layout, ker_data}
+    : _ifm_name(ifm_name), _ifm_shape(ifm_shape), _ofm_name(ofm_name), _ofm_shape(ofm_shape),
+      _ker{ker_shape, ker_layout, ker_data}
   {
     // DO NOTHING
   }
diff --git a/compiler/nnsuite/conv/nnkit-tflite/ConvBackend.test.cpp b/compiler/nnsuite/conv/nnkit-tflite/ConvBackend.test.cpp
index 98ac78fc252..bf1f1dcf758 100644
--- a/compiler/nnsuite/conv/nnkit-tflite/ConvBackend.test.cpp
+++ b/compiler/nnsuite/conv/nnkit-tflite/ConvBackend.test.cpp
@@ -38,8 +38,8 @@ class TestModel : public nnsuite::conv::Model
   TestModel(const std::string &ifm_name, const feature::Shape &ifm_shape,
             const std::string &ofm_name, const feature::Shape &ofm_shape,
             const kernel::Shape &ker_shape, const kernel::Layout &ker_layout, float *ker_data)
-    : _ifm_name(ifm_name), _ifm_shape(ifm_shape), _ofm_name(ofm_name),
-      _ofm_shape(ofm_shape), _ker{ker_shape, ker_layout, ker_data}
+    : _ifm_name(ifm_name), _ifm_shape(ifm_shape), _ofm_name(ofm_name), _ofm_shape(ofm_shape),
+      _ker{ker_shape, ker_layout, ker_data}
   {
     // DO NOTHING
   }
diff --git a/compiler/oops/include/oops/UserExn.h b/compiler/oops/include/oops/UserExn.h
index 84a6b81eb03..af4526cf3ba 100644
--- a/compiler/oops/include/oops/UserExn.h
+++ b/compiler/oops/include/oops/UserExn.h
@@ -43,7 +43,7 @@ class UserExn : public std::exception
 public:
   UserExn() = delete;
 
-  template <typename... Info> UserExn(const std::string &msg, Info &&... args)
+  template <typename... Info> UserExn(const std::string &msg, Info &&...args)
   {
     std::stringstream out;
 
@@ -58,7 +58,7 @@ class UserExn : public std::exception
 
 private:
   template <typename Attr, typename Val, typename... AttsVals>
-  void build_info(std::stringstream &out, Attr &attr, Val &val, AttsVals &... args)
+  void build_info(std::stringstream &out, Attr &attr, Val &val, AttsVals &...args)
   {
     out << pepper::str(attr, " = ", val);
     out << ", ";
diff --git a/compiler/pepper-str/include/pepper/str.h b/compiler/pepper-str/include/pepper/str.h
index 0c74aa85aef..9b33f336dde 100644
--- a/compiler/pepper-str/include/pepper/str.h
+++ b/compiler/pepper-str/include/pepper/str.h
@@ -27,7 +27,7 @@ namespace pepper
 namespace details
 {
 
-template <typename... Arg> void str_impl(std::ostream &os, Arg &&... args);
+template <typename... Arg> void str_impl(std::ostream &os, Arg &&...args);
 
 template <> inline void str_impl(std::ostream &)
 {
@@ -41,7 +41,7 @@ template <typename Arg> inline void str_impl(std::ostream &os, Arg &&arg)
 }
 
 template <typename Arg, typename... Args>
-inline void str_impl(std::ostream &os, Arg &&arg, Args &&... args)
+inline void str_impl(std::ostream &os, Arg &&arg, Args &&...args)
 {
   str_impl(os, std::forward<Arg>(arg));
   str_impl(os, std::forward<Args>(args)...);
@@ -53,7 +53,7 @@ inline void str_impl(std::ostream &os, Arg &&arg, Args &&... args)
 namespace pepper
 {
 
-template <typename... Args> static inline std::string str(Args &&... args)
+template <typename... Args> static inline std::string str(Args &&...args)
 {
   std::stringstream ss;
   details::str_impl(ss, std::forward<Args>(args)...);
diff --git a/compiler/pp/include/pp/Format.h b/compiler/pp/include/pp/Format.h
index 68c1d6c31c9..18ad031a28f 100644
--- a/compiler/pp/include/pp/Format.h
+++ b/compiler/pp/include/pp/Format.h
@@ -25,13 +25,13 @@ namespace pp
 
 template <typename Arg> static inline void _fmt(std::ostream &os, const Arg &arg) { os << arg; }
 template <typename Arg, typename... Args>
-static inline void _fmt(std::ostream &os, const Arg &arg, const Args &... args)
+static inline void _fmt(std::ostream &os, const Arg &arg, const Args &...args)
 {
   _fmt(os, arg);
   _fmt(os, args...);
 }
 
-template <typename... Args> static inline std::string fmt(const Args &... args)
+template <typename... Args> static inline std::string fmt(const Args &...args)
 {
   std::stringstream ss;
   _fmt(ss, args...);
diff --git a/compiler/pp/include/pp/IndentedStringBuilder.h b/compiler/pp/include/pp/IndentedStringBuilder.h
index fabefe9888d..9bb8124aff9 100644
--- a/compiler/pp/include/pp/IndentedStringBuilder.h
+++ b/compiler/pp/include/pp/IndentedStringBuilder.h
@@ -40,10 +40,7 @@ class IndentedStringBuilder
   std::string build(const std::string &content);
 
 public:
-  template <typename... Args> std::string build(const Args &... args)
-  {
-    return build(fmt(args...));
-  }
+  template <typename... Args> std::string build(const Args &...args) { return build(fmt(args...)); }
 
 private:
   uint32_t _level;
diff --git a/compiler/pp/include/pp/LinearDocument.h b/compiler/pp/include/pp/LinearDocument.h
index f9abd89cdd6..1f2c49c3da8 100644
--- a/compiler/pp/include/pp/LinearDocument.h
+++ b/compiler/pp/include/pp/LinearDocument.h
@@ -70,7 +70,7 @@ class LinearDocument final : public MultiLineText
     }
   }
 
-  template <typename... Args> void append(const Args &... args) { append(fmt(args...)); }
+  template <typename... Args> void append(const Args &...args) { append(fmt(args...)); }
 
 public:
   void append(const LinearDocument &doc);
diff --git a/compute/ARMComputeEx/src/core/CL/cl_kernels/gemmlowp.cl b/compute/ARMComputeEx/src/core/CL/cl_kernels/gemmlowp.cl
index 2d9acc7532c..c19766c9f17 100644
--- a/compute/ARMComputeEx/src/core/CL/cl_kernels/gemmlowp.cl
+++ b/compute/ARMComputeEx/src/core/CL/cl_kernels/gemmlowp.cl
@@ -2141,26 +2141,26 @@ __kernel void gemmlowp_offset_contribution_quantize_down(TENSOR3D_DECLARATION(mm
  * element in the output shifts vector
  */
 __kernel void
-  gemmlowp_offset_contribution_quantize_down_fixedpoint(TENSOR3D_DECLARATION(mm_result)
+gemmlowp_offset_contribution_quantize_down_fixedpoint(TENSOR3D_DECLARATION(mm_result)
 #if defined(A_OFFSET)
-                                                          ,
-                                                        IMAGE_DECLARATION(sum_col)
+                                                        ,
+                                                      IMAGE_DECLARATION(sum_col)
 #endif // defined(A_OFFSET)
 #if defined(B_OFFSET)
-                                                          ,
-                                                        IMAGE_DECLARATION(sum_row)
+                                                        ,
+                                                      IMAGE_DECLARATION(sum_row)
 #endif // defined(B_OFFSET)
-                                                          ,
+                                                        ,
 #if defined(ADD_BIAS)
-                                                        VECTOR_DECLARATION(biases),
+                                                      VECTOR_DECLARATION(biases),
 #endif // defined(ADD_BIAS)
-                                                        TENSOR3D_DECLARATION(dst)
+                                                      TENSOR3D_DECLARATION(dst)
 #if defined(PER_CHANNEL_QUANTIZATION)
-                                                          ,
-                                                        VECTOR_DECLARATION(result_multipliers),
-                                                        VECTOR_DECLARATION(result_shifts)
+                                                        ,
+                                                      VECTOR_DECLARATION(result_multipliers),
+                                                      VECTOR_DECLARATION(result_shifts)
 #endif // defined(PER_CHANNEL_QUANTIZATION)
-  )
+)
 {
   const int x = get_global_id(0) * 4;
   const int y = get_global_id(1);
diff --git a/compute/ARMComputeEx/src/core/NEON/kernels/NEOneHotKernel.cpp b/compute/ARMComputeEx/src/core/NEON/kernels/NEOneHotKernel.cpp
index e56fbf7f3c3..04eb407e99b 100644
--- a/compute/ARMComputeEx/src/core/NEON/kernels/NEOneHotKernel.cpp
+++ b/compute/ARMComputeEx/src/core/NEON/kernels/NEOneHotKernel.cpp
@@ -105,8 +105,8 @@ bool isOnValue(U index, U depth)
 } // namespace
 
 NEOneHotKernel::NEOneHotKernel()
-  : _indices{nullptr}, _depth{nullptr}, _on_value{nullptr},
-    _off_value{nullptr}, _axis{-1}, _output{nullptr}, _func{}
+  : _indices{nullptr}, _depth{nullptr}, _on_value{nullptr}, _off_value{nullptr}, _axis{-1},
+    _output{nullptr}, _func{}
 {
 }
 
diff --git a/compute/cker/include/cker/NeonTensorUtils.h b/compute/cker/include/cker/NeonTensorUtils.h
index 45ad969c3ac..e4aecd06d29 100644
--- a/compute/cker/include/cker/NeonTensorUtils.h
+++ b/compute/cker/include/cker/NeonTensorUtils.h
@@ -157,11 +157,11 @@ inline const int8_t *ShuffleVectors(const int8_t *vectors, const int n_batch, co
         "st4 {v0.s, v1.s, v2.s, v3.s}[2], [%[shuffled_vectors_ptr]], #16\n"
         "st4 {v0.s, v1.s, v2.s, v3.s}[3], [%[shuffled_vectors_ptr]], #16\n"
 
-        : [ unshuffled_vec0_ptr ] "+r"(unshuffled_vec0_ptr),
-          [ unshuffled_vec1_ptr ] "+r"(unshuffled_vec1_ptr),
-          [ unshuffled_vec2_ptr ] "+r"(unshuffled_vec2_ptr),
-          [ unshuffled_vec3_ptr ] "+r"(unshuffled_vec3_ptr),
-          [ shuffled_vectors_ptr ] "+r"(shuffled_vectors_ptr)
+        : [unshuffled_vec0_ptr] "+r"(unshuffled_vec0_ptr),
+          [unshuffled_vec1_ptr] "+r"(unshuffled_vec1_ptr),
+          [unshuffled_vec2_ptr] "+r"(unshuffled_vec2_ptr),
+          [unshuffled_vec3_ptr] "+r"(unshuffled_vec3_ptr),
+          [shuffled_vectors_ptr] "+r"(shuffled_vectors_ptr)
         :
         : "v0", "v1", "v2", "v3", "cc", "memory");
     }
@@ -296,10 +296,10 @@ static void DotprodMatrixBatchFourVectorMultiplyAccumulate(const int8_t *__restr
         "st2 {v9.s, v10.s}[1], [%[result_ptr]], %[wide_rows]\n"
         "st2 {v9.s, v10.s}[2], [%[result_ptr]], %[wide_rows]\n"
         "st2 {v9.s, v10.s}[3], [%[result_ptr]], %[wide_rows]\n"
-        : [ mat_ptr0 ] "+r"(mat_ptr0), [ mat_ptr1 ] "+r"(mat_ptr1), [ vec_ptr ] "+r"(vec_ptr),
-          [ result_ptr ] "+r"(result_ptr), [ mat_ptr2 ] "+r"(mat_ptr2), [ mat_ptr3 ] "+r"(mat_ptr3)
-        : [ mat_ptr0_end ] "r"(mat_ptr0_end), [ scaling_factors_ptr ] "r"(scaling_factors_ptr),
-          [ wide_rows ] "r"(wide_rows)
+        : [mat_ptr0] "+r"(mat_ptr0), [mat_ptr1] "+r"(mat_ptr1), [vec_ptr] "+r"(vec_ptr),
+          [result_ptr] "+r"(result_ptr), [mat_ptr2] "+r"(mat_ptr2), [mat_ptr3] "+r"(mat_ptr3)
+        : [mat_ptr0_end] "r"(mat_ptr0_end), [scaling_factors_ptr] "r"(scaling_factors_ptr),
+          [wide_rows] "r"(wide_rows)
         : "x0", "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v8", "v9", "v10", "v11", "v12",
           "v13", "cc", "memory");
     }
@@ -419,13 +419,13 @@ static void DotprodMatrixBatchFourVectorMultiplyAccumulate(
         "st2 {v9.s, v10.s}[1], [%[result_ptr]], %[wide_rows]\n"
         "st2 {v9.s, v10.s}[2], [%[result_ptr]], %[wide_rows]\n"
         "st2 {v9.s, v10.s}[3], [%[result_ptr]], %[wide_rows]\n"
-        : [ mat_ptr0 ] "+r"(mat_ptr0), [ mat_ptr1 ] "+r"(mat_ptr1), [ vec_ptr ] "+r"(vec_ptr),
-          [ result_ptr ] "+r"(result_ptr), [ row_sums_ptr ] "+r"(row_sums_ptr)
-        : [ mat_ptr0_end ] "r"(mat_ptr0_end), [ scaling_factors_ptr ] "r"(scaling_factors_ptr),
-          [ wide_rows ] "r"(wide_rows), [ channel_scales_ptr ] "r"(channel_scales_ptr),
-          [ batch_offsets_ptr ] "r"(batch_offsets_ptr),
-          [ is_channel_scale_nullptr ] "r"(is_channel_scale_nullptr),
-          [ is_row_sums_nullptr ] "r"(is_row_sums_nullptr)
+        : [mat_ptr0] "+r"(mat_ptr0), [mat_ptr1] "+r"(mat_ptr1), [vec_ptr] "+r"(vec_ptr),
+          [result_ptr] "+r"(result_ptr), [row_sums_ptr] "+r"(row_sums_ptr)
+        : [mat_ptr0_end] "r"(mat_ptr0_end), [scaling_factors_ptr] "r"(scaling_factors_ptr),
+          [wide_rows] "r"(wide_rows), [channel_scales_ptr] "r"(channel_scales_ptr),
+          [batch_offsets_ptr] "r"(batch_offsets_ptr),
+          [is_channel_scale_nullptr] "r"(is_channel_scale_nullptr),
+          [is_row_sums_nullptr] "r"(is_row_sums_nullptr)
         : "x0", "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v8", "v9", "v10", "v11", "v12",
           "v13", "v14", "v15", "v16", "v17", "w0", "w1", "cc", "memory");
     }
diff --git a/compute/cker/include/cker/eigen/EigenSupport.h b/compute/cker/include/cker/eigen/EigenSupport.h
index e3b10990e2b..5497f1e4a39 100644
--- a/compute/cker/include/cker/eigen/EigenSupport.h
+++ b/compute/cker/include/cker/eigen/EigenSupport.h
@@ -18,7 +18,7 @@
 #ifndef __NNFW_CKER_EIGEN_EIGEN_SUPPORT_H__
 #define __NNFW_CKER_EIGEN_EIGEN_SUPPORT_H__
 
-//#if defined(CKER_OPTIMIZED_EIGEN)
+// #if defined(CKER_OPTIMIZED_EIGEN)
 
 #include <Eigen/Core>
 #include <thread>
@@ -117,6 +117,6 @@ inline const Eigen::ThreadPoolDevice *GetThreadPoolDevice()
 } // namespace cker
 } // namespace nnfw
 
-//#endif // defined(CKER_OPTIMIZED_EIGEN)
+// #endif // defined(CKER_OPTIMIZED_EIGEN)
 
 #endif // __NNFW_CKER_EIGEN_EIGEN_SUPPORT_H__
diff --git a/compute/cker/include/cker/eigen/eigen_convolution_helpers.h b/compute/cker/include/cker/eigen/eigen_convolution_helpers.h
index 9d4fd2eaf98..856ae78eed4 100644
--- a/compute/cker/include/cker/eigen/eigen_convolution_helpers.h
+++ b/compute/cker/include/cker/eigen/eigen_convolution_helpers.h
@@ -60,8 +60,8 @@ class TensorEvaluatorHasPartialPacket
   template <typename TensorEvaluatorT, typename PacketT, typename IndexT>
   static auto functionExistsSfinae(...) -> std::false_type;
 
-  typedef decltype(
-    functionExistsSfinae<TensorEvaluatorType, PacketType, IndexType>(nullptr)) status;
+  typedef decltype(functionExistsSfinae<TensorEvaluatorType, PacketType, IndexType>(
+    nullptr)) status;
 
   static constexpr bool value = status::value;
 };
diff --git a/compute/cker/include/cker/eigen/eigen_spatial_convolutions.h b/compute/cker/include/cker/eigen/eigen_spatial_convolutions.h
index c6f1e2ee7bf..70d3718fe09 100644
--- a/compute/cker/include/cker/eigen/eigen_spatial_convolutions.h
+++ b/compute/cker/include/cker/eigen/eigen_spatial_convolutions.h
@@ -18,7 +18,7 @@
 #ifndef __NNFW_CKER_EGIEN_EIGEN_SPATIAL_CONVOLUTIONS_H__
 #define __NNFW_CKER_EGIEN_EIGEN_SPATIAL_CONVOLUTIONS_H__
 
-//#define EIGEN_USE_CUSTOM_THREAD_POOL
+// #define EIGEN_USE_CUSTOM_THREAD_POOL
 #define EIGEN_USE_THREADS
 #include "unsupported/Eigen/CXX11/Tensor"
 
diff --git a/compute/cker/include/cker/operation/Helper/RandomOpCpu.h b/compute/cker/include/cker/operation/Helper/RandomOpCpu.h
index c99f69709f0..06a858707db 100644
--- a/compute/cker/include/cker/operation/Helper/RandomOpCpu.h
+++ b/compute/cker/include/cker/operation/Helper/RandomOpCpu.h
@@ -147,9 +147,9 @@ template <class Distribution> struct FillPhiloxRandomTask<Distribution, true>
 // Partial specialization for CPU to fill the entire region with randoms
 // It splits the work into several tasks and run them in parallel
 template <class Distribution>
-void FillPhiloxRandom<CPUDevice, Distribution>::
-operator()(random::PhiloxRandom gen, typename Distribution::ResultElementType *data, int64_t size,
-           Distribution dist)
+void FillPhiloxRandom<CPUDevice, Distribution>::operator()(
+  random::PhiloxRandom gen, typename Distribution::ResultElementType *data, int64_t size,
+  Distribution dist)
 {
   FillPhiloxRandomTask<Distribution, Distribution::kVariableSamplesPerOutput>::Run(gen, data, size,
                                                                                    dist);
diff --git a/compute/cker/src/train/Adam.test.cc b/compute/cker/src/train/Adam.test.cc
index fea2d2eb183..0d0effe30e3 100644
--- a/compute/cker/src/train/Adam.test.cc
+++ b/compute/cker/src/train/Adam.test.cc
@@ -30,8 +30,8 @@ template <typename T> class AdamOptimizerVerifier
                         float beta1, float beta2, float epsilon, bool use_nesterov,
                         uint32_t nums_step)
     : _trainable{trainable}, _gradient{gradient}, _m{m}, _v{v}, _learning_rate{learning_rate},
-      _beta1{beta1}, _beta2{beta2}, _epsilon{epsilon}, _use_nesterov{use_nesterov}, _nums_step{
-                                                                                      nums_step}
+      _beta1{beta1}, _beta2{beta2}, _epsilon{epsilon}, _use_nesterov{use_nesterov},
+      _nums_step{nums_step}
   {
     EXPECT_TRUE(trainable.size() == gradient.size());
     EXPECT_TRUE(trainable.size() == m.size());
diff --git a/compute/cker/src/train/SGD.test.cc b/compute/cker/src/train/SGD.test.cc
index c082ca6a7b5..0a819b33633 100644
--- a/compute/cker/src/train/SGD.test.cc
+++ b/compute/cker/src/train/SGD.test.cc
@@ -25,8 +25,8 @@ template <typename T> class SGDOptimizerVerifier
 public:
   SGDOptimizerVerifier(const std::vector<T> &trainable, const std::vector<T> &gradient,
                        float learning_rate, uint32_t nums_step)
-    : _trainable{trainable}, _gradient{gradient}, _learning_rate{learning_rate}, _nums_step{
-                                                                                   nums_step}
+    : _trainable{trainable}, _gradient{gradient}, _learning_rate{learning_rate},
+      _nums_step{nums_step}
   {
     EXPECT_TRUE(trainable.size() == gradient.size());
 
diff --git a/infra/command/format b/infra/command/format
index 302f24c7539..1e6f6ad1386 100644
--- a/infra/command/format
+++ b/infra/command/format
@@ -4,7 +4,7 @@ INVALID_EXIT=0
 FILES_TO_CHECK=()
 DIRECTORIES_TO_BE_TESTED=()
 DIRECTORIES_NOT_TO_BE_TESTED=()
-DEFAULT_CLANG_VERSION="8"
+DEFAULT_CLANG_VERSION="16"
 CLANG_FORMAT_CANDIDATE=clang-format-$DEFAULT_CLANG_VERSION
 PATCH_FILE=format.patch
 CHECK_DIFF_ONLY="0"
@@ -117,7 +117,8 @@ function check_cpp_files() {
   if [[ -z "${CLANG_FORMAT}" ]]; then
     echo "[ERROR] $CLANG_FORMAT_CANDIDATE is unavailable"
     echo
-    echo "        Please install $CLANG_FORMAT_CANDIDATE before running format check"
+    echo "        Please install $CLANG_FORMAT_MIGRATE before running format check (refer https://github.com/Samsung/ONE/issues/12311#issuecomment-1857503157)"
+    echo "        If you use docker for format checking, please pull or build latest version"
     exit 1
   fi
 
diff --git a/onert-micro/externals/.FORMATDENY b/onert-micro/externals/.FORMATDENY
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/onert-micro/luci-interpreter/src/Interpreter.cpp b/onert-micro/luci-interpreter/src/Interpreter.cpp
index 71330eaa78c..a0dd6552385 100644
--- a/onert-micro/luci-interpreter/src/Interpreter.cpp
+++ b/onert-micro/luci-interpreter/src/Interpreter.cpp
@@ -38,7 +38,10 @@ Interpreter::Interpreter(const char *model_data_raw, const InterpreterConfigure
     _memory_manager = std::make_unique<StaticMemoryManager>(
       configuration._input_buf_size, configuration._temp_buf_size, configuration._output_buf_size);
   }
-  else { _memory_manager = std::make_unique<SimpleMemoryManager>(); }
+  else
+  {
+    _memory_manager = std::make_unique<SimpleMemoryManager>();
+  }
 
   _memory_manager->is_allocate_input(configuration.getAllocateInputValue());
 
diff --git a/runtime/contrib/TFLiteSharp/TFLiteNative/include/tflite_log.h b/runtime/contrib/TFLiteSharp/TFLiteNative/include/tflite_log.h
index 3d71f89aa6b..62738066c2f 100644
--- a/runtime/contrib/TFLiteSharp/TFLiteNative/include/tflite_log.h
+++ b/runtime/contrib/TFLiteSharp/TFLiteNative/include/tflite_log.h
@@ -47,11 +47,12 @@ extern "C" {
     }                                                 \
   } while (0)
 #else // __TIZEN__
-#define LEVEL_TO_STR(level)                  \
-  (((level) == ERROR) ? "ERROR"              \
-                      : ((level) == WARNING) \
-                          ? "WARNING"        \
-                          : ((level) == INFO) ? "INFO" : ((level) == DEBUG) ? "DEBUG" : "DEFAULT")
+#define LEVEL_TO_STR(level)           \
+  (((level) == ERROR)     ? "ERROR"   \
+   : ((level) == WARNING) ? "WARNING" \
+   : ((level) == INFO)    ? "INFO"    \
+   : ((level) == DEBUG)   ? "DEBUG"   \
+                          : "DEFAULT")
 #define TFLITE_NATIVE_LOG(log_level, format, args...)      \
   do                                                       \
   {                                                        \
diff --git a/runtime/libs/misc/include/misc/string_helpers.h b/runtime/libs/misc/include/misc/string_helpers.h
index c9d72034fb1..307f649af0e 100644
--- a/runtime/libs/misc/include/misc/string_helpers.h
+++ b/runtime/libs/misc/include/misc/string_helpers.h
@@ -30,7 +30,7 @@ namespace
 
 template <typename Arg> void _str(std::ostream &os, Arg &&arg) { os << std::forward<Arg>(arg); }
 
-template <typename Arg, typename... Args> void _str(std::ostream &os, Arg &&arg, Args &&... args)
+template <typename Arg, typename... Args> void _str(std::ostream &os, Arg &&arg, Args &&...args)
 {
   _str(os, std::forward<Arg>(arg));
   _str(os, std::forward<Args>(args)...);
@@ -55,7 +55,7 @@ inline std::vector<std::string> split(const std::string &s, char delim)
   return elems;
 }
 
-template <typename... Args> std::string str(Args &&... args)
+template <typename... Args> std::string str(Args &&...args)
 {
   std::stringstream ss;
   _str(ss, std::forward<Args>(args)...);
diff --git a/runtime/onert/backend/acl_cl/KernelGenerator.cc b/runtime/onert/backend/acl_cl/KernelGenerator.cc
index dcf31858ecd..3bc8900f38c 100644
--- a/runtime/onert/backend/acl_cl/KernelGenerator.cc
+++ b/runtime/onert/backend/acl_cl/KernelGenerator.cc
@@ -47,9 +47,8 @@ using ActivationBuilder = ::onert::backend::acl_common::AclActivationBuilder<
 KernelGenerator::KernelGenerator(
   const ir::Graph &graph, const std::shared_ptr<TensorBuilder> &tensor_builder,
   const std::shared_ptr<acl_common::AclTensorRegistry<TensorManager>> &tensor_reg)
-  : basic::KernelGeneratorBase{graph}, _ctx(graph.operands()),
-    _operations_ctx(graph.operations()), _current_layout{graph.layout()},
-    _tensor_builder(tensor_builder), _tensor_reg(tensor_reg)
+  : basic::KernelGeneratorBase{graph}, _ctx(graph.operands()), _operations_ctx(graph.operations()),
+    _current_layout{graph.layout()}, _tensor_builder(tensor_builder), _tensor_reg(tensor_reg)
 {
   // DO NOTHING
 }
diff --git a/runtime/onert/backend/acl_cl/Optimizer.cc b/runtime/onert/backend/acl_cl/Optimizer.cc
index 0f779f4834f..d1f92fe98e7 100644
--- a/runtime/onert/backend/acl_cl/Optimizer.cc
+++ b/runtime/onert/backend/acl_cl/Optimizer.cc
@@ -31,8 +31,8 @@ namespace acl_cl
 {
 
 Optimizer::Optimizer(BackendContext *context)
-  : _context{context}, _tensor_builder{
-                         std::dynamic_pointer_cast<TensorBuilder>(context->tensor_builder)}
+  : _context{context},
+    _tensor_builder{std::dynamic_pointer_cast<TensorBuilder>(context->tensor_builder)}
 {
   assert(context);
 }
diff --git a/runtime/onert/backend/acl_common/AclKernelGen.h b/runtime/onert/backend/acl_common/AclKernelGen.h
index e05d36a1257..c068fb728d6 100644
--- a/runtime/onert/backend/acl_common/AclKernelGen.h
+++ b/runtime/onert/backend/acl_common/AclKernelGen.h
@@ -45,7 +45,7 @@ void disableDimCorrection(IACLTensor *tensor)
 }
 
 template <typename Layer, typename... Args>
-std::unique_ptr<arm_compute::IFunction> generateLayer(Args &&... args)
+std::unique_ptr<arm_compute::IFunction> generateLayer(Args &&...args)
 {
   auto l = std::make_unique<Layer>();
 
@@ -56,7 +56,7 @@ std::unique_ptr<arm_compute::IFunction> generateLayer(Args &&... args)
 
 template <typename Layer, typename... Args>
 std::unique_ptr<arm_compute::IFunction>
-generateLayer(std::shared_ptr<arm_compute::IMemoryManager> memory_manager, Args &&... args)
+generateLayer(std::shared_ptr<arm_compute::IMemoryManager> memory_manager, Args &&...args)
 {
   auto l = std::make_unique<Layer>(memory_manager);
 
diff --git a/runtime/onert/backend/acl_neon/KernelGenerator.cc b/runtime/onert/backend/acl_neon/KernelGenerator.cc
index e71aa369353..4eeeab806d8 100644
--- a/runtime/onert/backend/acl_neon/KernelGenerator.cc
+++ b/runtime/onert/backend/acl_neon/KernelGenerator.cc
@@ -46,9 +46,8 @@ using ActivationBuilder = ::onert::backend::acl_common::AclActivationBuilder<
 KernelGenerator::KernelGenerator(
   const ir::Graph &graph, const std::shared_ptr<TensorBuilder> &tensor_builder,
   const std::shared_ptr<acl_common::AclTensorRegistry<TensorManager>> &tensor_reg)
-  : basic::KernelGeneratorBase{graph}, _ctx(graph.operands()),
-    _operations_ctx(graph.operations()), _current_layout{graph.layout()},
-    _tensor_builder(tensor_builder), _tensor_reg(tensor_reg)
+  : basic::KernelGeneratorBase{graph}, _ctx(graph.operands()), _operations_ctx(graph.operations()),
+    _current_layout{graph.layout()}, _tensor_builder(tensor_builder), _tensor_reg(tensor_reg)
 {
   // DO NOTHING
 }
diff --git a/runtime/onert/backend/acl_neon/Optimizer.cc b/runtime/onert/backend/acl_neon/Optimizer.cc
index f207ca8cb0b..7c7d5e0ee5e 100644
--- a/runtime/onert/backend/acl_neon/Optimizer.cc
+++ b/runtime/onert/backend/acl_neon/Optimizer.cc
@@ -31,8 +31,8 @@ namespace acl_neon
 {
 
 Optimizer::Optimizer(BackendContext *context)
-  : _context{context}, _tensor_builder{
-                         std::dynamic_pointer_cast<TensorBuilder>(context->tensor_builder)}
+  : _context{context},
+    _tensor_builder{std::dynamic_pointer_cast<TensorBuilder>(context->tensor_builder)}
 {
   assert(context);
 }
diff --git a/runtime/onert/backend/cl_common/include/cl_common/BackendContext.h b/runtime/onert/backend/cl_common/include/cl_common/BackendContext.h
index 06aafa1b925..eae148de76a 100644
--- a/runtime/onert/backend/cl_common/include/cl_common/BackendContext.h
+++ b/runtime/onert/backend/cl_common/include/cl_common/BackendContext.h
@@ -41,8 +41,8 @@ class BackendContext : public onert::backend::BackendContext
                  std::shared_ptr<T_ConstantInitializer> constant_initializer = nullptr,
                  std::shared_ptr<T_KernelGenerator> kernel_gen = nullptr)
     : onert::backend::BackendContext(backend, std::move(data), tensor_registry),
-      tensor_builder{tensor_builder}, constant_initializer{constant_initializer}, kernel_gen{
-                                                                                    kernel_gen}
+      tensor_builder{tensor_builder}, constant_initializer{constant_initializer},
+      kernel_gen{kernel_gen}
   {
   }
 
diff --git a/runtime/onert/backend/cpu/KernelGenerator.cc b/runtime/onert/backend/cpu/KernelGenerator.cc
index 59a7e1208f8..779cfc5871a 100644
--- a/runtime/onert/backend/cpu/KernelGenerator.cc
+++ b/runtime/onert/backend/cpu/KernelGenerator.cc
@@ -231,10 +231,9 @@ KernelGenerator::KernelGenerator(
   const std::shared_ptr<basic::TensorRegistry> &tensor_reg,
   const std::shared_ptr<backend::custom::IKernelBuilder> &kernel_builder,
   const std::shared_ptr<ExternalContext> &external_context)
-  : basic::KernelGeneratorBase{graph},
-    _ctx(graph.operands()), _operations_ctx{graph.operations()}, _current_layout{graph.layout()},
-    _tensor_builder(tensor_builder), _tensor_reg{tensor_reg}, _kernel_builder(kernel_builder),
-    _external_context(external_context)
+  : basic::KernelGeneratorBase{graph}, _ctx(graph.operands()), _operations_ctx{graph.operations()},
+    _current_layout{graph.layout()}, _tensor_builder(tensor_builder), _tensor_reg{tensor_reg},
+    _kernel_builder(kernel_builder), _external_context(external_context)
 {
   // DO NOTHING
 }
diff --git a/runtime/onert/backend/cpu/ops/CompareLayer.cc b/runtime/onert/backend/cpu/ops/CompareLayer.cc
index b621952cc3e..07b74029127 100644
--- a/runtime/onert/backend/cpu/ops/CompareLayer.cc
+++ b/runtime/onert/backend/cpu/ops/CompareLayer.cc
@@ -62,7 +62,7 @@ void compareQuant8(const IPortableTensor *lhs, const IPortableTensor *rhs, IPort
   params.is_broadcast = !HaveSameShapes(lhs, rhs);
 
   using CompareFunction = void (*)(
-    ComparisonParams & params, const Shape &input1_shape, const T *input1_data,
+    ComparisonParams &params, const Shape &input1_shape, const T *input1_data,
     const Shape &input2_shape, const T *input2_data, const Shape &output_shape, bool *output_data);
 
   static const CompareFunction broadcast_fns[] = {
diff --git a/runtime/onert/backend/gpu_cl/KernelGenerator.cc b/runtime/onert/backend/gpu_cl/KernelGenerator.cc
index de8d3b463a5..5db0025232a 100644
--- a/runtime/onert/backend/gpu_cl/KernelGenerator.cc
+++ b/runtime/onert/backend/gpu_cl/KernelGenerator.cc
@@ -210,9 +210,9 @@ KernelGenerator::KernelGenerator(
   const ir::Graph &graph, const std::shared_ptr<TensorBuilder> &tensor_builder,
   const std::shared_ptr<TensorRegistry> &tensor_reg,
   const std::shared_ptr<tflite::gpu::cl::CreationContext> &creation_context)
-  : basic::KernelGeneratorBase{graph}, _ctx(graph.operands()),
-    _operations_ctx(graph.operations()), _current_layout{graph.layout()},
-    _tensor_builder(tensor_builder), _tensor_reg(tensor_reg), _creation_context(creation_context)
+  : basic::KernelGeneratorBase{graph}, _ctx(graph.operands()), _operations_ctx(graph.operations()),
+    _current_layout{graph.layout()}, _tensor_builder(tensor_builder), _tensor_reg(tensor_reg),
+    _creation_context(creation_context)
 {
 }
 
diff --git a/runtime/onert/backend/ruy/KernelGenerator.cc b/runtime/onert/backend/ruy/KernelGenerator.cc
index e5f2dbd399b..90fbc844791 100644
--- a/runtime/onert/backend/ruy/KernelGenerator.cc
+++ b/runtime/onert/backend/ruy/KernelGenerator.cc
@@ -77,10 +77,9 @@ KernelGenerator::KernelGenerator(
   const std::shared_ptr<basic::TensorRegistry> &tensor_reg,
   const std::shared_ptr<backend::custom::IKernelBuilder> &kernel_builder,
   const std::shared_ptr<ExternalContext> &external_context)
-  : basic::KernelGeneratorBase{graph},
-    _ctx(graph.operands()), _operations_ctx{graph.operations()}, _current_layout{graph.layout()},
-    _tensor_builder(tensor_builder), _tensor_reg{tensor_reg}, _kernel_builder(kernel_builder),
-    _external_context(external_context)
+  : basic::KernelGeneratorBase{graph}, _ctx(graph.operands()), _operations_ctx{graph.operations()},
+    _current_layout{graph.layout()}, _tensor_builder(tensor_builder), _tensor_reg{tensor_reg},
+    _kernel_builder(kernel_builder), _external_context(external_context)
 {
   // DO NOTHING
 }
diff --git a/runtime/onert/backend/train/BackendContext.h b/runtime/onert/backend/train/BackendContext.h
index c3674ae1d4a..9e1b9dbb2fb 100644
--- a/runtime/onert/backend/train/BackendContext.h
+++ b/runtime/onert/backend/train/BackendContext.h
@@ -57,9 +57,8 @@ class BackendContext : public onert::backend::train::TrainableBackendContext
                  std::unique_ptr<exec::train::optimizer::Optimizer> optimizer = nullptr,
                  std::shared_ptr<KernelGenerator> kernel_gen = nullptr)
     : onert::backend::train::TrainableBackendContext(backend, std::move(tdata), tensor_registry),
-      kernel_gen{kernel_gen},
-      _external_context(new ExternalContext), _tensor_builder{tensor_builder}, _optimizer{std::move(
-                                                                                 optimizer)}
+      kernel_gen{kernel_gen}, _external_context(new ExternalContext),
+      _tensor_builder{tensor_builder}, _optimizer{std::move(optimizer)}
   {
   }
   BackendContext(const BackendContext &) = delete;
diff --git a/runtime/onert/backend/train/KernelGenerator.cc b/runtime/onert/backend/train/KernelGenerator.cc
index 67b412c7cb0..22f098edf4c 100644
--- a/runtime/onert/backend/train/KernelGenerator.cc
+++ b/runtime/onert/backend/train/KernelGenerator.cc
@@ -113,8 +113,8 @@ KernelGenerator::KernelGenerator(const ir::train::TrainableGraph &tgraph,
                                  const std::shared_ptr<ExternalContext> &external_context,
                                  const exec::train::optimizer::Optimizer *optimizer)
   : backend::train::KernelGeneratorBase{tgraph}, _current_layout{tgraph.layout()},
-    _tensor_reg{tensor_reg},
-    _external_context(external_context), _optimizer{optimizer}, _update_funcs{}
+    _tensor_reg{tensor_reg}, _external_context(external_context), _optimizer{optimizer},
+    _update_funcs{}
 {
   // DO NOTHING
 }
diff --git a/runtime/onert/backend/train/TensorBuilder.cc b/runtime/onert/backend/train/TensorBuilder.cc
index 2c8fdfd6a94..9d6204e8cd1 100644
--- a/runtime/onert/backend/train/TensorBuilder.cc
+++ b/runtime/onert/backend/train/TensorBuilder.cc
@@ -28,8 +28,8 @@ namespace train
 TensorBuilder::TensorBuilder(const std::shared_ptr<TensorRegistry> &tensor_reg,
                              const exec::train::optimizer::Optimizer *optimizer,
                              const std::string planner_id)
-  : _tensor_reg{tensor_reg}, _tensor_mgr{new TensorManager(tensor_reg, planner_id)}, _optimizer{
-                                                                                       optimizer}
+  : _tensor_reg{tensor_reg}, _tensor_mgr{new TensorManager(tensor_reg, planner_id)},
+    _optimizer{optimizer}
 {
   /* empty */
 }
diff --git a/runtime/onert/backend/train/TensorManager.cc b/runtime/onert/backend/train/TensorManager.cc
index f5b9ce5b453..ad7e26a3833 100644
--- a/runtime/onert/backend/train/TensorManager.cc
+++ b/runtime/onert/backend/train/TensorManager.cc
@@ -60,8 +60,8 @@ namespace train
 TensorManager::TensorManager(const std::shared_ptr<TensorRegistry> &reg,
                              const std::string planner_id)
   : _nonconst_mgr{new MemoryManager(planner_id)}, _trainable_mgr{new MemoryManager(planner_id)},
-    _back_prop_mgr{new MemoryManager(planner_id)},
-    _gradient_mgr{new MemoryManager(planner_id)}, _tensors{reg}
+    _back_prop_mgr{new MemoryManager(planner_id)}, _gradient_mgr{new MemoryManager(planner_id)},
+    _tensors{reg}
 {
   // DO NOTHING
 }
diff --git a/runtime/onert/backend/train/ops/FullyConnectedLayer.cc b/runtime/onert/backend/train/ops/FullyConnectedLayer.cc
index 539a759307e..20be151a4f0 100644
--- a/runtime/onert/backend/train/ops/FullyConnectedLayer.cc
+++ b/runtime/onert/backend/train/ops/FullyConnectedLayer.cc
@@ -55,8 +55,8 @@ namespace ops
 FullyConnectedLayer::FullyConnectedLayer()
   : cpu::ops::FullyConnectedLayer{}, _grad_weights{nullptr}, _grad_bias{nullptr},
     _back_prop_input{nullptr}, _back_prop_output{nullptr}, _transposed_weights{nullptr},
-    _transposed_input{nullptr}, _transposed_back_prop_output{nullptr}, _act_back_prop_output{
-                                                                         nullptr}
+    _transposed_input{nullptr}, _transposed_back_prop_output{nullptr},
+    _act_back_prop_output{nullptr}
 {
   // DO NOTHING
 }
diff --git a/runtime/onert/backend/trix/BatchThreadPool.h b/runtime/onert/backend/trix/BatchThreadPool.h
index bc2936fb42d..e1e2257efb0 100644
--- a/runtime/onert/backend/trix/BatchThreadPool.h
+++ b/runtime/onert/backend/trix/BatchThreadPool.h
@@ -53,8 +53,7 @@ class BatchThreadPool
    * @return std::future<typename std::result_of<F(uint32_t, Args...)>::type>
    */
   template <class F, class... Args>
-  std::future<typename std::result_of<F(uint32_t, Args...)>::type> enqueueJob(F &&f,
-                                                                              Args &&... args)
+  std::future<typename std::result_of<F(uint32_t, Args...)>::type> enqueueJob(F &&f, Args &&...args)
   {
     if (_stop_all)
     {
diff --git a/runtime/onert/backend/trix/KernelGenerator.cc b/runtime/onert/backend/trix/KernelGenerator.cc
index 2783bd75b87..01c4e33ec94 100644
--- a/runtime/onert/backend/trix/KernelGenerator.cc
+++ b/runtime/onert/backend/trix/KernelGenerator.cc
@@ -38,9 +38,9 @@ KernelGenerator::KernelGenerator(const ir::Graph &graph,
                                  const std::shared_ptr<TensorBuilder> &tensor_builder,
                                  const std::shared_ptr<basic::TensorRegistry> &tensor_reg,
                                  const std::shared_ptr<DevContext> &dev_context)
-  : basic::KernelGeneratorBase{graph},
-    _ctx(graph.operands()), _operations_ctx{graph.operations()}, _current_layout{graph.layout()},
-    _tensor_builder(tensor_builder), _tensor_reg{tensor_reg}, _dev_context{dev_context}
+  : basic::KernelGeneratorBase{graph}, _ctx(graph.operands()), _operations_ctx{graph.operations()},
+    _current_layout{graph.layout()}, _tensor_builder(tensor_builder), _tensor_reg{tensor_reg},
+    _dev_context{dev_context}
 {
   // DO NOTHING
 }
diff --git a/runtime/onert/backend/xnnpack/KernelGenerator.cc b/runtime/onert/backend/xnnpack/KernelGenerator.cc
index b72149131d2..2a0cc8f5d55 100644
--- a/runtime/onert/backend/xnnpack/KernelGenerator.cc
+++ b/runtime/onert/backend/xnnpack/KernelGenerator.cc
@@ -41,10 +41,9 @@ KernelGenerator::KernelGenerator(
   const std::shared_ptr<basic::TensorRegistry> &tensor_reg,
   const std::shared_ptr<backend::custom::IKernelBuilder> &kernel_builder,
   const std::shared_ptr<ExternalContext> &external_context)
-  : basic::KernelGeneratorBase{graph},
-    _ctx(graph.operands()), _operations_ctx{graph.operations()}, _current_layout{graph.layout()},
-    _tensor_builder(tensor_builder), _tensor_reg{tensor_reg}, _kernel_builder(kernel_builder),
-    _external_context(external_context)
+  : basic::KernelGeneratorBase{graph}, _ctx(graph.operands()), _operations_ctx{graph.operations()},
+    _current_layout{graph.layout()}, _tensor_builder(tensor_builder), _tensor_reg{tensor_reg},
+    _kernel_builder(kernel_builder), _external_context(external_context)
 {
   // DO NOTHING
 }
diff --git a/runtime/onert/core/include/exec/FunctionSequence.h b/runtime/onert/core/include/exec/FunctionSequence.h
index f3384be3c53..075aa1a3db9 100644
--- a/runtime/onert/core/include/exec/FunctionSequence.h
+++ b/runtime/onert/core/include/exec/FunctionSequence.h
@@ -35,7 +35,7 @@ namespace exec
 class FunctionSequence : public IFunction
 {
 public:
-  template <typename... Args> FunctionSequence(Args &&... args) { initialize(std::move(args)...); }
+  template <typename... Args> FunctionSequence(Args &&...args) { initialize(std::move(args)...); }
 
 private:
   void initialize()
@@ -43,7 +43,7 @@ class FunctionSequence : public IFunction
     // Template base case : do nothing
   }
 
-  template <typename T, typename... Args> void initialize(std::unique_ptr<T> &&fn, Args &&... args)
+  template <typename T, typename... Args> void initialize(std::unique_ptr<T> &&fn, Args &&...args)
   {
     _functions.emplace_back(std::move(fn));
     initialize(std::move(args)...);
@@ -64,7 +64,7 @@ class FunctionSequence : public IFunction
 
   void iterate(const std::function<void(IFunction &)> &fn);
 
-  template <typename T, typename... Args> void wrap(Args &&... args)
+  template <typename T, typename... Args> void wrap(Args &&...args)
   {
     for (auto &&function : _functions)
     {
diff --git a/runtime/onert/core/include/ir/Operand.h b/runtime/onert/core/include/ir/Operand.h
index 60b636f7abb..71da3e4a8a9 100644
--- a/runtime/onert/core/include/ir/Operand.h
+++ b/runtime/onert/core/include/ir/Operand.h
@@ -79,7 +79,7 @@ class Operand
   bool isConstant(void) const { return _info.isConstant(); }
 
 public:
-  template <typename T, typename... Args> void data(Args &&... args)
+  template <typename T, typename... Args> void data(Args &&...args)
   {
     data(std::make_unique<T>(std::forward<Args>(args)...));
   }
diff --git a/runtime/onert/core/include/ir/train/LossInfo.h b/runtime/onert/core/include/ir/train/LossInfo.h
index cd33c066220..a5cc694047c 100644
--- a/runtime/onert/core/include/ir/train/LossInfo.h
+++ b/runtime/onert/core/include/ir/train/LossInfo.h
@@ -48,8 +48,8 @@ struct LossInfo
   } loss_param;
 
   LossInfo()
-    : loss_code{LossCode::Undefined}, reduction_type{LossReductionType::Undefined}, loss_param{-1,
-                                                                                               0.0f}
+    : loss_code{LossCode::Undefined}, reduction_type{LossReductionType::Undefined},
+      loss_param{-1, 0.0f}
   {
   }
 };
diff --git a/runtime/onert/core/include/util/ObjectManager.h b/runtime/onert/core/include/util/ObjectManager.h
index 077a4c2ef13..ceac5332e06 100644
--- a/runtime/onert/core/include/util/ObjectManager.h
+++ b/runtime/onert/core/include/util/ObjectManager.h
@@ -46,7 +46,7 @@ template <typename Index, typename Object> class ObjectManager
    * @param[in] args Arguments for creating Operand object
    * @return Created index that is associated to the object if successful, Undefined index otherwise
    */
-  template <class... Args> Index emplace(Args &&... args)
+  template <class... Args> Index emplace(Args &&...args)
   {
     auto index = generateIndex();
     if (!index.valid())
diff --git a/runtime/onert/core/src/backend/basic/StaticTensorManager.cc b/runtime/onert/core/src/backend/basic/StaticTensorManager.cc
index 71cde4cdeaa..04dbc4a6b50 100644
--- a/runtime/onert/core/src/backend/basic/StaticTensorManager.cc
+++ b/runtime/onert/core/src/backend/basic/StaticTensorManager.cc
@@ -29,8 +29,8 @@ namespace basic
 
 StaticTensorManager::StaticTensorManager(const std::shared_ptr<TensorRegistry> &reg,
                                          DynamicTensorManager *dynamic_tensor_manager)
-  : _nonconst_mgr{new MemoryManager()}, _tensors{reg}, _dynamic_tensor_manager{
-                                                         dynamic_tensor_manager}
+  : _nonconst_mgr{new MemoryManager()}, _tensors{reg},
+    _dynamic_tensor_manager{dynamic_tensor_manager}
 {
   // DO NOTHING
 }
@@ -38,8 +38,8 @@ StaticTensorManager::StaticTensorManager(const std::shared_ptr<TensorRegistry> &
 StaticTensorManager::StaticTensorManager(const std::shared_ptr<TensorRegistry> &reg,
                                          const std::string planner_id,
                                          DynamicTensorManager *dynamic_tensor_manager)
-  : _nonconst_mgr{new MemoryManager(planner_id)}, _tensors{reg}, _dynamic_tensor_manager{
-                                                                   dynamic_tensor_manager}
+  : _nonconst_mgr{new MemoryManager(planner_id)}, _tensors{reg},
+    _dynamic_tensor_manager{dynamic_tensor_manager}
 {
   // DO NOTHING
 }
diff --git a/runtime/onert/core/src/backend/builtin/kernel/PermuteLayer.h b/runtime/onert/core/src/backend/builtin/kernel/PermuteLayer.h
index 227e324346d..cf25f5447c1 100644
--- a/runtime/onert/core/src/backend/builtin/kernel/PermuteLayer.h
+++ b/runtime/onert/core/src/backend/builtin/kernel/PermuteLayer.h
@@ -72,8 +72,8 @@ class PermuteLayer : public onert::exec::IPermuteFunction
     PermuteWorkerTask(const uint8_t *src_buffer, uint8_t *dst_buffer, uint32_t src_start_offset,
                       uint32_t dst_start_offset, size_t size)
       : _src_buffer{src_buffer}, _dst_buffer{dst_buffer}, _src_start_offset{src_start_offset},
-        _dst_start_offset{dst_start_offset}, _src_strides{0}, _dst_strides{0},
-        _loop_shape{1}, _size{size}, _src_layout{}, _dst_layout{}, _is_permutation{false}
+        _dst_start_offset{dst_start_offset}, _src_strides{0}, _dst_strides{0}, _loop_shape{1},
+        _size{size}, _src_layout{}, _dst_layout{}, _is_permutation{false}
     {
       // DO NOTHING
     }
diff --git a/runtime/onert/core/src/backend/builtin/kernel/WhileLayer.cc b/runtime/onert/core/src/backend/builtin/kernel/WhileLayer.cc
index 8b00db468de..25354d4201d 100644
--- a/runtime/onert/core/src/backend/builtin/kernel/WhileLayer.cc
+++ b/runtime/onert/core/src/backend/builtin/kernel/WhileLayer.cc
@@ -41,8 +41,8 @@ WhileLayer::WhileLayer(const std::vector<backend::IPortableTensor *> input_tenso
                        const std::shared_ptr<ExternalContext> &external_context)
   : _cond_subg_index{cond_subg_index}, _body_subg_index{body_subg_index},
     _input_tensors{input_tensors}, _output_tensors{output_tensors}, _executors{executors},
-    _model_index{model_index}, _dyn_memory_manager{dyn_memory_manager}, _external_context{
-                                                                          external_context}
+    _model_index{model_index}, _dyn_memory_manager{dyn_memory_manager},
+    _external_context{external_context}
 {
   // At this point, executors may not have executors of cond subg and body subg
 }
diff --git a/runtime/onert/core/src/backend/builtin/train/BackendContext.h b/runtime/onert/core/src/backend/builtin/train/BackendContext.h
index 6f8ce4caed5..4782756c31c 100644
--- a/runtime/onert/core/src/backend/builtin/train/BackendContext.h
+++ b/runtime/onert/core/src/backend/builtin/train/BackendContext.h
@@ -41,8 +41,8 @@ class BackendContext : public backend::train::TrainableBackendContext
                  std::shared_ptr<TensorBuilder> tensor_builder = nullptr,
                  std::shared_ptr<KernelGenerator> kernel_gen = nullptr)
     : backend::train::TrainableBackendContext(backend, std::move(data), tensor_registry),
-      kernel_gen{kernel_gen},
-      _external_context(new ExternalContext), _tensor_builder{tensor_builder}
+      kernel_gen{kernel_gen}, _external_context(new ExternalContext),
+      _tensor_builder{tensor_builder}
   {
   }
 
diff --git a/runtime/onert/core/src/backend/builtin/train/kernel/PermuteLayer.cc b/runtime/onert/core/src/backend/builtin/train/kernel/PermuteLayer.cc
index ac433ad5227..922bd332e34 100644
--- a/runtime/onert/core/src/backend/builtin/train/kernel/PermuteLayer.cc
+++ b/runtime/onert/core/src/backend/builtin/train/kernel/PermuteLayer.cc
@@ -37,8 +37,8 @@ PermuteLayer::PermuteLayer(const std::vector<ITensor *> &src_tensors,
                            const std::shared_ptr<ExternalContext> &external_context)
   : builtin::kernel::PermuteLayer{src_tensors, dst_tensors, external_context},
     _input_back_prop_tensors{input_back_prop_tensors},
-    _output_back_prop_tensors{output_back_prop_tensors}, _ignore_forward_in_training{
-                                                           ignore_forward_in_training}
+    _output_back_prop_tensors{output_back_prop_tensors},
+    _ignore_forward_in_training{ignore_forward_in_training}
 {
   assert(input_back_prop_tensors.size() == output_back_prop_tensors.size());
   assert(src_tensors.size() == dst_tensors.size());
diff --git a/runtime/onert/core/src/compiler/HEScheduler.test.cc b/runtime/onert/core/src/compiler/HEScheduler.test.cc
index 1654bfc8b31..505fbbb4867 100644
--- a/runtime/onert/core/src/compiler/HEScheduler.test.cc
+++ b/runtime/onert/core/src/compiler/HEScheduler.test.cc
@@ -206,7 +206,7 @@ void setPermutationsExecutionTime(const std::vector<const Backend *> &backends,
 using OIS = OperandIndexSequence;
 
 template <typename NodeT, typename... Types>
-OperationIndex create(std::shared_ptr<Graph> graph, Types &&... args)
+OperationIndex create(std::shared_ptr<Graph> graph, Types &&...args)
 {
   auto op = std::make_unique<NodeT>(std::forward<Types>(args)...);
   auto op_idx = graph->addOperation(std::move(op));
diff --git a/runtime/onert/core/src/compiler/train/UntrainableOperationConverter.cc b/runtime/onert/core/src/compiler/train/UntrainableOperationConverter.cc
index 6a5a052b6d7..22f7604b5e4 100644
--- a/runtime/onert/core/src/compiler/train/UntrainableOperationConverter.cc
+++ b/runtime/onert/core/src/compiler/train/UntrainableOperationConverter.cc
@@ -30,8 +30,8 @@ UntrainableOperationConverter::UntrainableOperationConverter(ir::train::Trainabl
 {
 }
 
-std::unique_ptr<ir::train::ITrainableOperation> UntrainableOperationConverter::
-operator()(const ir::IOperation &op)
+std::unique_ptr<ir::train::ITrainableOperation>
+UntrainableOperationConverter::operator()(const ir::IOperation &op)
 {
   op.accept(*this);
 
diff --git a/runtime/onert/core/src/exec/ExecutorBase.cc b/runtime/onert/core/src/exec/ExecutorBase.cc
index 0bc088b0289..829a01af48a 100644
--- a/runtime/onert/core/src/exec/ExecutorBase.cc
+++ b/runtime/onert/core/src/exec/ExecutorBase.cc
@@ -29,9 +29,8 @@ ExecutorBase::ExecutorBase(std::unique_ptr<compiler::LoweredGraph> &&lowered_gra
                            backend::BackendContexts &&backend_contexts,
                            const compiler::TensorRegistries &tensor_regs,
                            const util::TracingCtx *tracing_ctx)
-  : _lowered_graph{std::move(lowered_graph)},
-    _backend_contexts{std::move(backend_contexts)}, _graph{_lowered_graph->graph()}, _mutex(),
-    _tracing_ctx(tracing_ctx)
+  : _lowered_graph{std::move(lowered_graph)}, _backend_contexts{std::move(backend_contexts)},
+    _graph{_lowered_graph->graph()}, _mutex(), _tracing_ctx(tracing_ctx)
 {
   auto build_tensor_list = [&](const auto &ind_seq, auto &tensors) {
     assert(tensors.empty());
diff --git a/runtime/onert/core/src/exec/MultiModelExecutors.h b/runtime/onert/core/src/exec/MultiModelExecutors.h
index 82853719cbf..0aa7ffeea4b 100644
--- a/runtime/onert/core/src/exec/MultiModelExecutors.h
+++ b/runtime/onert/core/src/exec/MultiModelExecutors.h
@@ -26,9 +26,8 @@ namespace std
 
 template <> struct hash<std::pair<::onert::ir::ModelIndex, ::onert::ir::SubgraphIndex>>
 {
-  size_t
-  operator()(const std::pair<::onert::ir::ModelIndex, ::onert::ir::SubgraphIndex> &pair) const
-    noexcept
+  size_t operator()(
+    const std::pair<::onert::ir::ModelIndex, ::onert::ir::SubgraphIndex> &pair) const noexcept
   {
     return (hash<uint32_t>()(pair.first.value()) << 16) ^ hash<uint32_t>()(pair.second.value());
   }
diff --git a/runtime/onert/core/src/exec/feature/nchw/Reader.h b/runtime/onert/core/src/exec/feature/nchw/Reader.h
index d5e3cb97cef..e1a963cbdc6 100644
--- a/runtime/onert/core/src/exec/feature/nchw/Reader.h
+++ b/runtime/onert/core/src/exec/feature/nchw/Reader.h
@@ -42,11 +42,10 @@ template <typename T> class Reader : public feature::Reader<T>
     : _shape{shape}, _strides{strides}, _ptr{reinterpret_cast<const uint8_t *>(ptr)}, _len{len}
   {
     UNUSED_RELEASE(len); // Workaround for unused variable in release mode
-    assert(len == static_cast<size_t>(strides.N != 0
-                                        ? shape.N * strides.N
-                                        : strides.C != 0 ? shape.C * strides.C
-                                                         : strides.H != 0 ? shape.H * strides.H
-                                                                          : shape.W * strides.W));
+    assert(len == static_cast<size_t>(strides.N != 0   ? shape.N * strides.N
+                                      : strides.C != 0 ? shape.C * strides.C
+                                      : strides.H != 0 ? shape.H * strides.H
+                                                       : shape.W * strides.W));
   }
 
   // Construct for backend tensor
diff --git a/runtime/onert/core/src/exec/feature/nhwc/Reader.h b/runtime/onert/core/src/exec/feature/nhwc/Reader.h
index 0bc1ee95b16..3e3c431bfa5 100644
--- a/runtime/onert/core/src/exec/feature/nhwc/Reader.h
+++ b/runtime/onert/core/src/exec/feature/nhwc/Reader.h
@@ -43,11 +43,10 @@ template <typename T> class Reader : public feature::Reader<T>
     : _shape{shape}, _strides{strides}, _ptr{reinterpret_cast<const uint8_t *>(ptr)}, _len{len}
   {
     UNUSED_RELEASE(len); // Workaround for unused variable in release mode
-    assert(len == static_cast<size_t>(strides.N != 0
-                                        ? shape.N * strides.N
-                                        : strides.H != 0 ? shape.H * strides.H
-                                                         : strides.W != 0 ? shape.W * strides.W
-                                                                          : shape.C * strides.C));
+    assert(len == static_cast<size_t>(strides.N != 0   ? shape.N * strides.N
+                                      : strides.H != 0 ? shape.H * strides.H
+                                      : strides.W != 0 ? shape.W * strides.W
+                                                       : shape.C * strides.C));
   }
 
   // Construct for backend tensor
diff --git a/runtime/onert/frontend/base_loader/include/base_loader.h b/runtime/onert/frontend/base_loader/include/base_loader.h
index 7efc9f13671..bc1c49f7edf 100644
--- a/runtime/onert/frontend/base_loader/include/base_loader.h
+++ b/runtime/onert/frontend/base_loader/include/base_loader.h
@@ -127,7 +127,7 @@ template <typename LoaderDomain> class BaseLoader
   virtual std::unique_ptr<ir::Graph> loadSubgraph(const SubGraph *subg) = 0;
   // Operations
   template <typename OpIR, typename... Args>
-  const OpIR *loadOperationTo(const Operator *op, ir::Graph &subg, Args &&... args);
+  const OpIR *loadOperationTo(const Operator *op, ir::Graph &subg, Args &&...args);
 
   void loadAddV2(const Operator *op, ir::Graph &subg);
   void loadArgMinMax(const Operator *op, ir::Graph &subg, bool is_argmax);
@@ -653,7 +653,7 @@ void BaseLoader<LoaderDomain>::loadPool2DOptions(Param &param, const Pool2DOptio
 template <typename LoaderDomain>
 template <typename OpIR, typename... Args>
 const OpIR *BaseLoader<LoaderDomain>::loadOperationTo(const Operator *op, ir::Graph &subg,
-                                                      Args &&... args)
+                                                      Args &&...args)
 {
   static_assert(sizeof...(args) <= 1, "You can't have more than 1 arguments!");
   ir::OperandIndexSequence inputs;
diff --git a/runtime/onert/frontend/nnapi/wrapper/ANeuralNetworksModel.cc b/runtime/onert/frontend/nnapi/wrapper/ANeuralNetworksModel.cc
index 837dac954a4..ced3fa3d7da 100644
--- a/runtime/onert/frontend/nnapi/wrapper/ANeuralNetworksModel.cc
+++ b/runtime/onert/frontend/nnapi/wrapper/ANeuralNetworksModel.cc
@@ -27,8 +27,8 @@
 // ANeuralNetworksModel
 //
 ANeuralNetworksModel::ANeuralNetworksModel() noexcept
-  : _finished_building{false}, _optional_operands{}, _operand_usages{}, _allowFloat32toFloat16{
-                                                                          false}
+  : _finished_building{false}, _optional_operands{}, _operand_usages{},
+    _allowFloat32toFloat16{false}
 {
   _graph = std::make_shared<onert::ir::Graph>();
 }