diff --git a/mace/core/future.h b/mace/core/future.h
index abae9feed57ad5866ebd2c3228776ad0f52e007b..887812b2be86efbd4643aed0a8594d1ab99e00dc 100644
--- a/mace/core/future.h
+++ b/mace/core/future.h
@@ -20,6 +20,6 @@ struct StatsFuture {
   };
 };
 
-}  //  namespace mace
+}  // namespace mace
 
 #endif  // MACE_CORE_FUTURE_H_
diff --git a/mace/core/mace.cc b/mace/core/mace.cc
index 3e0d642f8affcdf541d016519d063991636156cc..81e26246a77ed5cd22630b6ec4579b0a9882ef39 100644
--- a/mace/core/mace.cc
+++ b/mace/core/mace.cc
@@ -598,4 +598,4 @@ bool MaceEngine::Run(const float *input,
   }
 }
 
-} //  namespace mace
+}  // namespace mace
diff --git a/mace/core/net.h b/mace/core/net.h
index 28246e641bd73d63cd9747ad95d793a894ff7fea..1f57794f5ea1c7900daf5a6907f5cf15d076b9cc 100644
--- a/mace/core/net.h
+++ b/mace/core/net.h
@@ -63,6 +63,6 @@ std::unique_ptr<NetBase> CreateNet(
     DeviceType type,
     const NetMode mode = NetMode::NORMAL);
 
-}  //  namespace mace
+}  // namespace mace
 
 #endif  // MACE_CORE_NET_H_
diff --git a/mace/core/operator.h b/mace/core/operator.h
index 9f3c1e083071146b56554706c4b7bd4e31c4c654..773db3ddb84f0432b3bb44ff7802ee700ea542ce 100644
--- a/mace/core/operator.h
+++ b/mace/core/operator.h
@@ -169,6 +169,6 @@ MACE_DECLARE_REGISTRY(OpRegistry,
 #define REGISTER_OPERATOR(op_registry, name, ...) \
   MACE_REGISTER_CLASS(OpRegistry, op_registry->registry(), name, __VA_ARGS__)
 
-}  //  namespace mace
+}  // namespace mace
 
 #endif  // MACE_CORE_OPERATOR_H
diff --git a/mace/core/types.cc b/mace/core/types.cc
index 46ea6b0a2d04a73ed7db870aeee5815539fa6112..e466f2585169a86fd410ee35f4cc34ab75671ad7 100644
--- a/mace/core/types.cc
+++ b/mace/core/types.cc
@@ -74,4 +74,4 @@ size_t GetEnumTypeSize(const DataType dt) {
   }
 }
 
-}  //  namespace mace
+}  // namespace mace
diff --git a/mace/kernels/bias_add.h b/mace/kernels/bias_add.h
index ce92806e9a9327611506532a97c2687437c02e93..bea5a79033393f1c38e924d5cf4f81fb83effa6d 100644
--- a/mace/kernels/bias_add.h
+++ b/mace/kernels/bias_add.h
@@ -66,7 +66,7 @@ struct BiasAddFunctor<DeviceType::OPENCL, T> {
   cl::Kernel kernel_;
 };
 
-}  //  namepsace kernels
-}  //  namespace mace
+}  // namepsace kernels
+}  // namespace mace
 
-#endif  //  MACE_KERNELS_BIAS_ADD_H_
+#endif  // MACE_KERNELS_BIAS_ADD_H_
diff --git a/mace/kernels/buffer_to_image.h b/mace/kernels/buffer_to_image.h
index f3690eb19ab598242c1128efdaf25dea3fee4ab7..a3ef4cb202250094e65008001089c4070f8bb442 100644
--- a/mace/kernels/buffer_to_image.h
+++ b/mace/kernels/buffer_to_image.h
@@ -39,7 +39,7 @@ struct BufferToImageFunctor<DeviceType::OPENCL, T> : BufferToImageFunctorBase{
                   StatsFuture *future);
 };
 
-}  //  namepsace kernels
-}  //  namespace mace
+}  // namepsace kernels
+}  // namespace mace
 
-#endif  //  MACE_KERNELS_BUFFER_TO_IMAGE_H_
+#endif  // MACE_KERNELS_BUFFER_TO_IMAGE_H_
diff --git a/mace/kernels/channel_shuffle.h b/mace/kernels/channel_shuffle.h
index 83c8bb498aae735257e3b97dc5cb0b183db83e16..c4f48a2f49b2fb144e94c6426c7e9aa989d0ef79 100644
--- a/mace/kernels/channel_shuffle.h
+++ b/mace/kernels/channel_shuffle.h
@@ -43,7 +43,7 @@ class ChannelShuffleFunctor {
   const int group_;
 };
 
-}  //  namespace kernels
-}  //  namespace mace
+}  // namespace kernels
+}  // namespace mace
 
 #endif  // MACE_KERNELS_CHANNEL_SHUFFLE_H_
diff --git a/mace/kernels/concat.h b/mace/kernels/concat.h
index 17ba7c69925b54728985275b232c40c8f0732d43..50171db76bd8c9b7170e7c05d9d50e3b842c77b5 100644
--- a/mace/kernels/concat.h
+++ b/mace/kernels/concat.h
@@ -85,7 +85,7 @@ struct ConcatFunctor<DeviceType::OPENCL, T> : ConcatFunctorBase{
 
 };
 
-}  //  namepsace kernels
-}  //  namespace mace
+}  // namepsace kernels
+}  // namespace mace
 
-#endif  //  MACE_KERNELS_CONCAT_H_
+#endif  // MACE_KERNELS_CONCAT_H_
diff --git a/mace/kernels/conv_pool_2d_util.h b/mace/kernels/conv_pool_2d_util.h
index 87f9546f829c7ef81ba1275de8ee8d1c21ccb77d..de5410c1c779acb0088a2604714ddb1e46f8d2d2 100644
--- a/mace/kernels/conv_pool_2d_util.h
+++ b/mace/kernels/conv_pool_2d_util.h
@@ -50,7 +50,7 @@ void ConstructNHWCInputWithPadding(const Tensor *input,
                                    Tensor *output_tensor,
                                    bool padding_same_value = false);
 
-}  //  namespace kernels
-}  //  namespace mace
+}  // namespace kernels
+}  // namespace mace
 
 #endif  // MACE_KERNELS_CONV_POOL_2D_UTIL_H_
diff --git a/mace/kernels/fully_connected.h b/mace/kernels/fully_connected.h
index c3b662222a58d8dea1180195e2bdb8aae0c56eca..f6d7c8e589d7352c78e6cdd891ffa2dc69275bb8 100644
--- a/mace/kernels/fully_connected.h
+++ b/mace/kernels/fully_connected.h
@@ -90,7 +90,7 @@ struct FullyConnectedFunctor<DeviceType::OPENCL, T> : FullyConnectedBase {
   cl::Kernel kernel_;
 };
 
-}  //  namespace kernels
-}  //  namespace mace
+}  // namespace kernels
+}  // namespace mace
 
 #endif  // MACE_KERNELS_FULLY_CONNECTED_H_
diff --git a/mace/kernels/global_avg_pooling.h b/mace/kernels/global_avg_pooling.h
index 372e6242c1298e87fee95e535b813c70d8a75f06..8b718e571822cbbd689f5827cc8bf0b5914dcccd 100644
--- a/mace/kernels/global_avg_pooling.h
+++ b/mace/kernels/global_avg_pooling.h
@@ -42,7 +42,7 @@ void GlobalAvgPoolingFunctor<DeviceType::NEON, float>::operator()(
     const float *input, const index_t *input_shape,
     float *output, StatsFuture *future);
 
-}  //  namespace kernels
-}  //  namespace mace
+}  // namespace kernels
+}  // namespace mace
 
 #endif  // MACE_KERNELS_GLOBAL_AVG_POOLING_H_
diff --git a/mace/kernels/matmul.h b/mace/kernels/matmul.h
index 4b486c7280d92f2684d56bd6aed5a6b9477aea61..5ed6e77e8c9a41127a7819aaada4dc7eedd94d0e 100644
--- a/mace/kernels/matmul.h
+++ b/mace/kernels/matmul.h
@@ -63,7 +63,7 @@ struct MatMulFunctor<DeviceType::OPENCL, T> {
   cl::Kernel kernel_;
 };
 
-}  //  namespace kernels
-}  //  namespace mace
+}  // namespace kernels
+}  // namespace mace
 
 #endif  // MACE_KERNELS_MATMUL_H_
diff --git a/mace/kernels/neon/conv_2d_neon.cc b/mace/kernels/neon/conv_2d_neon.cc
index 229ac96f6b49596d70d2dc403ea97988ac60e684..566abd7511c3019ae1947d026cfbef0474a53062 100644
--- a/mace/kernels/neon/conv_2d_neon.cc
+++ b/mace/kernels/neon/conv_2d_neon.cc
@@ -106,5 +106,5 @@ void Conv2dFunctor<DeviceType::NEON, float>::operator()(const Tensor *input,
                    bias_data, output_data, output_shape);
 }
 
-}  //  namespace kernels
-}  //  namespace mace
+}  // namespace kernels
+}  // namespace mace
diff --git a/mace/kernels/neon/conv_2d_neon_3x3.cc b/mace/kernels/neon/conv_2d_neon_3x3.cc
index 5d5481580ded5a1f270a85d1cc6a28b4f3bdbd1a..6a2aa2eace0d724c62c210b2d18a1bfc6d75ee08 100644
--- a/mace/kernels/neon/conv_2d_neon_3x3.cc
+++ b/mace/kernels/neon/conv_2d_neon_3x3.cc
@@ -331,5 +331,5 @@ void Conv2dNeonK3x3S2(const float *input,  // NCHW
     }
   }
 }
-}  //  namespace kernels
-}  //  namespace mace
+}  // namespace kernels
+}  // namespace mace
diff --git a/mace/kernels/neon/conv_2d_neon_5x5.cc b/mace/kernels/neon/conv_2d_neon_5x5.cc
index ab50156fdc6c08daba89723e924f79677f3552b9..709610a3ddc57b65eb83d85c81e9bb65cd732f19 100644
--- a/mace/kernels/neon/conv_2d_neon_5x5.cc
+++ b/mace/kernels/neon/conv_2d_neon_5x5.cc
@@ -413,7 +413,7 @@ void Conv2dNeonK5x5S1(const float *input,  // NCHW
   }
 }
 
-}  //  namespace kernels
-}  //  namespace mace
+}  // namespace kernels
+}  // namespace mace
 
-#endif  //  MACE_KERNELS_NEON_CONV_2D_NEON_5X5_H_
+#endif  // MACE_KERNELS_NEON_CONV_2D_NEON_5X5_H_
diff --git a/mace/kernels/neon/depthwise_conv_neon.cc b/mace/kernels/neon/depthwise_conv_neon.cc
index c396ee21c0f651dffd1419fba7dc41b102c3a9c4..7fa1a9f5d8f75b50c19562d5633653ce6c78fa8d 100644
--- a/mace/kernels/neon/depthwise_conv_neon.cc
+++ b/mace/kernels/neon/depthwise_conv_neon.cc
@@ -77,5 +77,5 @@ void DepthwiseConv2dFunctor<DeviceType::NEON, float>::operator()(
                    output_shape);
 }
 
-}  //  namespace kernels
-}  //  namespace mace
+}  // namespace kernels
+}  // namespace mace
diff --git a/mace/kernels/opencl/addn.cc b/mace/kernels/opencl/addn.cc
index 84dcd7bd2dd3342b9ff66effaf63b5dc4c9576b6..3495ddca6f4d097e7ff5252c433dbd3f7e08e2f2 100644
--- a/mace/kernels/opencl/addn.cc
+++ b/mace/kernels/opencl/addn.cc
@@ -84,4 +84,4 @@ template
 struct AddNFunctor<DeviceType::OPENCL, half>;
 
 }  // namespace kernels
-}  //  namespace mace
+}  // namespace mace
diff --git a/mace/kernels/opencl/concat.cc b/mace/kernels/opencl/concat.cc
index b1712d149817244fa80df61f4ae96df8971c707f..beb6fefc34847c48b05f5043b5a13e749f32e58c 100644
--- a/mace/kernels/opencl/concat.cc
+++ b/mace/kernels/opencl/concat.cc
@@ -106,4 +106,4 @@ template
 struct ConcatFunctor<DeviceType::OPENCL, half>;
 
 }  // namespace kernels
-} //  namespace mace
+}  // namespace mace
diff --git a/mace/kernels/opencl/fully_connected_opencl.cc b/mace/kernels/opencl/fully_connected_opencl.cc
index f719bb0100e763514360d4bed837ba12e2ee9e0d..589a4e3368fe65a17c39ab5d5d32be26298435ee 100644
--- a/mace/kernels/opencl/fully_connected_opencl.cc
+++ b/mace/kernels/opencl/fully_connected_opencl.cc
@@ -103,4 +103,4 @@ template
 struct FullyConnectedFunctor<DeviceType::OPENCL, half>;
 
 }  // namespace kernels
-}  //  namespace mace
+}  // namespace mace
diff --git a/mace/kernels/opencl/helper.h b/mace/kernels/opencl/helper.h
index cc68466f1cdcc92eda3d484a9f2d628e86779b86..36e9827f346894834afa7c403f82ad03a83f7aa3 100644
--- a/mace/kernels/opencl/helper.h
+++ b/mace/kernels/opencl/helper.h
@@ -95,5 +95,5 @@ std::string Concat(Args... args) {
 }
 
 }  // namespace kernels
-} //  namespace mace
-#endif //  MACE_KERNELS_OPENCL_HELPER_H_
+}  // namespace mace
+#endif  // MACE_KERNELS_OPENCL_HELPER_H_
diff --git a/mace/kernels/opencl/matmul.cc b/mace/kernels/opencl/matmul.cc
index 44a92c611c4159248a1028eabf3a2b2903bbe76a..c7f618496392bc3ff63905507ba7cbe416f38d0f 100644
--- a/mace/kernels/opencl/matmul.cc
+++ b/mace/kernels/opencl/matmul.cc
@@ -74,4 +74,4 @@ template
 struct MatMulFunctor<DeviceType::OPENCL, half>;
 
 }  // namespace kernels
-}  //  namespace mace
+}  // namespace mace
diff --git a/mace/kernels/opencl/space_to_batch_opencl.cc b/mace/kernels/opencl/space_to_batch_opencl.cc
index 09219e6f804b03840af745018ab185e7112bcb1e..5940f4d3fdc8996b87765977db3a7120a86abb09 100644
--- a/mace/kernels/opencl/space_to_batch_opencl.cc
+++ b/mace/kernels/opencl/space_to_batch_opencl.cc
@@ -75,6 +75,6 @@ void SpaceToBatchFunctor<DeviceType::OPENCL, T>::operator()(Tensor *space_tensor
 template struct SpaceToBatchFunctor<DeviceType::OPENCL, float>;
 template struct SpaceToBatchFunctor<DeviceType::OPENCL, half>;
 
-} //  namespace kernels
-} //  namespace mace
-#endif //  MACE_KERNELS_OPENCL_SPACE_TO_BATCH_H_
+}  // namespace kernels
+}  // namespace mace
+#endif  // MACE_KERNELS_OPENCL_SPACE_TO_BATCH_H_
diff --git a/mace/kernels/pooling.h b/mace/kernels/pooling.h
index d9a28c547244304051aff0097440dc8797dd7cb0..8a0ea84521e90df2bf463f6d28e0d0e68da4a570 100644
--- a/mace/kernels/pooling.h
+++ b/mace/kernels/pooling.h
@@ -175,7 +175,7 @@ struct PoolingFunctor<DeviceType::OPENCL, T> : PoolingFunctorBase {
   cl::Kernel kernel_;
 };
 
-}  //  namespace kernels
-}  //  namespace mace
+}  // namespace kernels
+}  // namespace mace
 
 #endif  // MACE_KERNELS_POOLING_H
diff --git a/mace/kernels/softmax.h b/mace/kernels/softmax.h
index f95d84b3d9fbe5ae1a76de0a507866da8209fc02..5542c8d60734f68093d3bdce6e97ce14fc3135c6 100644
--- a/mace/kernels/softmax.h
+++ b/mace/kernels/softmax.h
@@ -59,7 +59,7 @@ struct SoftmaxFunctor<DeviceType::OPENCL, T> {
   cl::Kernel kernel_;
 };
 
-}  //  namepsace kernels
-}  //  namespace mace
+}  // namepsace kernels
+}  // namespace mace
 
-#endif  //  MACE_KERNELS_SOFTMAX_H_
+#endif  // MACE_KERNELS_SOFTMAX_H_
diff --git a/mace/ops/activation.cc b/mace/ops/activation.cc
index 96c04ac150e0b92b76032e162a09d96e07cc85ca..204896c3cb6538843254b99b7316a903a551aadb 100644
--- a/mace/ops/activation.cc
+++ b/mace/ops/activation.cc
@@ -26,4 +26,4 @@ void Register_Activation(OperatorRegistry *op_registry) {
                     ActivationOp<DeviceType::OPENCL, half>);
 }
 
-}  //  namespace mace
+}  // namespace mace
diff --git a/mace/ops/addn.cc b/mace/ops/addn.cc
index c0fd26715cfcc8b6401a45882f5e356b747594c9..2a18e458ac049bb17fe48309b745541b501dffd8 100644
--- a/mace/ops/addn.cc
+++ b/mace/ops/addn.cc
@@ -26,4 +26,4 @@ void Register_AddN(OperatorRegistry *op_registry) {
                     AddNOp<DeviceType::OPENCL, half>);
 }
 
-}  //  namespace mace
+}  // namespace mace
diff --git a/mace/ops/batch_norm.h b/mace/ops/batch_norm.h
index a3a0c136ba12105fa121dbe18372c1d41112e75e..52235410432704c604bd0eeea7fae3d1eb905608 100644
--- a/mace/ops/batch_norm.h
+++ b/mace/ops/batch_norm.h
@@ -55,6 +55,6 @@ class BatchNormOp : public Operator<D, T> {
   OP_OUTPUT_TAGS(OUTPUT);
 };
 
-}  //  namespace mace
+}  // namespace mace
 
-#endif  //  MACE_OPS_BATCH_NORM_H_
+#endif  // MACE_OPS_BATCH_NORM_H_
diff --git a/mace/ops/batch_to_space.cc b/mace/ops/batch_to_space.cc
index ece90171d44f31c3656de7dff712e8d9de0ba5a1..83a79fba400c56f4e83b0b6f73748bd559c9bbb7 100644
--- a/mace/ops/batch_to_space.cc
+++ b/mace/ops/batch_to_space.cc
@@ -19,4 +19,4 @@ void Register_BatchToSpaceND(OperatorRegistry *op_registry) {
                     BatchToSpaceNDOp<DeviceType::OPENCL, half>);
 }
 
-}  //  namespace mace
+}  // namespace mace
diff --git a/mace/ops/bias_add.cc b/mace/ops/bias_add.cc
index 63f8661df565fb1a92480680e873d022a0affbbe..44b147ea4ef4e5f93df1d8da8abfcca9f215b428 100644
--- a/mace/ops/bias_add.cc
+++ b/mace/ops/bias_add.cc
@@ -26,4 +26,4 @@ void Register_BiasAdd(OperatorRegistry *op_registry) {
                     BiasAddOp<DeviceType::OPENCL, half>);
 }
 
-}  //  namespace mace
+}  // namespace mace
diff --git a/mace/ops/bias_add.h b/mace/ops/bias_add.h
index 0088bfbd3bdbb3d3f51288fc3afb4fd18e5d8900..ddc88f731cdb7ebd5fe156f74c0c9d3c12258718 100644
--- a/mace/ops/bias_add.h
+++ b/mace/ops/bias_add.h
@@ -40,6 +40,6 @@ class BiasAddOp : public Operator<D, T> {
   OP_OUTPUT_TAGS(OUTPUT);
 };
 
-}  //  namespace mace
+}  // namespace mace
 
-#endif  //  MACE_BIAS_ADD_H_
+#endif  // MACE_BIAS_ADD_H_
diff --git a/mace/ops/concat.h b/mace/ops/concat.h
index 4105722d8890e13f0c670939df6e474f5ecba645..4577dc8bc559a81acd1271cf9f4f8fbee07eb607 100644
--- a/mace/ops/concat.h
+++ b/mace/ops/concat.h
@@ -40,6 +40,6 @@ class ConcatOp : public Operator<D, T> {
   OP_OUTPUT_TAGS(OUTPUT);
 };
 
-}  //  namespace mace
+}  // namespace mace
 
-#endif  //  MACE_OPS_CONCAT_H_
+#endif  // MACE_OPS_CONCAT_H_
diff --git a/mace/ops/concat_benchmark.cc b/mace/ops/concat_benchmark.cc
index 82f66c56cc0d9894586f66e62f067730d8384fc6..bcdfcf19f85b278079e57ac0db5b8e7557c5afc4 100644
--- a/mace/ops/concat_benchmark.cc
+++ b/mace/ops/concat_benchmark.cc
@@ -101,4 +101,4 @@ static void BM_CONCATOPENCLHalf(int iters, int dim1) {
 BENCHMARK(BM_CONCATOPENCLFloat)->Arg(32)->Arg(64)->Arg(128)->Arg(256);
 BENCHMARK(BM_CONCATOPENCLHalf)->Arg(32)->Arg(64)->Arg(128)->Arg(256);
 
-}  //  namespace mace
\ No newline at end of file
+}  // namespace mace
\ No newline at end of file
diff --git a/mace/ops/core_test.cc b/mace/ops/core_test.cc
index 30731dfeb7ee142be671fd207da78acf3ce04deb..5c4f6efaf2a6b19df77185aa9c9740f760cd069b 100644
--- a/mace/ops/core_test.cc
+++ b/mace/ops/core_test.cc
@@ -56,4 +56,4 @@ TEST(CoreTest, INIT_MODE) {
                           1e-5);
 }
 
-}  //  namespace mace
+}  // namespace mace
diff --git a/mace/ops/eltwise.cc b/mace/ops/eltwise.cc
index 0304ec1aa3d64a50a9ca6a1c1a08267578fe3dd6..88d7d43f0daa8e3434589fd8a5ae6c9673bf91d1 100644
--- a/mace/ops/eltwise.cc
+++ b/mace/ops/eltwise.cc
@@ -26,4 +26,4 @@ void Register_Eltwise(OperatorRegistry *op_registry) {
                     EltwiseOp<DeviceType::OPENCL, half>);
 }
 
-}  //  namespace mace
+}  // namespace mace
diff --git a/mace/ops/eltwise.h b/mace/ops/eltwise.h
index 7d8e63ee0deca2f96e5b9681d3eea76cca4ca171..5bbd944122d2a3107b917fca4048bf7317ec5176 100644
--- a/mace/ops/eltwise.h
+++ b/mace/ops/eltwise.h
@@ -42,6 +42,6 @@ class EltwiseOp : public Operator<D, T> {
   OP_OUTPUT_TAGS(OUTPUT);
 };
 
-}  //  namespace mace
+}  // namespace mace
 
-#endif  //  MACE_OPS_RESHAPE_H_
+#endif  // MACE_OPS_RESHAPE_H_
diff --git a/mace/ops/eltwise_benchmark.cc b/mace/ops/eltwise_benchmark.cc
index 018385629c6eaa4f5885099fd16cf3a9ea1e232b..c2f48643ecf85a687016a869e4fbae84be7b318e 100644
--- a/mace/ops/eltwise_benchmark.cc
+++ b/mace/ops/eltwise_benchmark.cc
@@ -81,4 +81,4 @@ BM_ELTWISE(0, 1, 240, 240, 256);
 BM_ELTWISE(1, 1, 240, 240, 256);
 BM_ELTWISE(2, 1, 240, 240, 256);
 
-}  //  namespace mace
+}  // namespace mace
diff --git a/mace/ops/folded_batch_norm.cc b/mace/ops/folded_batch_norm.cc
index b8fadbb72419800f61c73aed5cb0112447d41aff..8658d57719310b1c0dee6b497af3b0ab6c6bd048 100644
--- a/mace/ops/folded_batch_norm.cc
+++ b/mace/ops/folded_batch_norm.cc
@@ -29,4 +29,4 @@ void Register_FoldedBatchNorm(OperatorRegistry *op_registry) {
                     FoldedBatchNormOp<DeviceType::OPENCL, half>);
 }
 
-}  //  namespace mace
+}  // namespace mace
diff --git a/mace/ops/folded_batch_norm.h b/mace/ops/folded_batch_norm.h
index 7e7c7e5d855ffcaf4a7fea7b5feb332fc8695523..b4f00776321a52dade57680989e46f62b7b9e844 100644
--- a/mace/ops/folded_batch_norm.h
+++ b/mace/ops/folded_batch_norm.h
@@ -49,6 +49,6 @@ class FoldedBatchNormOp : public Operator<D, T> {
   OP_OUTPUT_TAGS(OUTPUT);
 };
 
-}  //  namespace mace
+}  // namespace mace
 
-#endif  //  MACE_OPS_FOLDED_BATCH_NORM_H_
+#endif  // MACE_OPS_FOLDED_BATCH_NORM_H_
diff --git a/mace/ops/fully_connected.cc b/mace/ops/fully_connected.cc
index 9b733794ec16c8fa485349444fe5ec14280d5eb4..7f9df74c3389be777dea74d2bd570e9b61c0f4cc 100644
--- a/mace/ops/fully_connected.cc
+++ b/mace/ops/fully_connected.cc
@@ -26,4 +26,4 @@ void Register_FullyConnected(OperatorRegistry *op_registry) {
                     FullyConnectedOp<DeviceType::OPENCL, half>);
 }
 
-}  //  namespace mace
+}  // namespace mace
diff --git a/mace/ops/global_avg_pooling.cc b/mace/ops/global_avg_pooling.cc
index d2ab13cfd8b8b7ca867af256a8d9e9a43e6c3ca3..65d34b49fff906c8159218a363afdcfcb70e67d4 100644
--- a/mace/ops/global_avg_pooling.cc
+++ b/mace/ops/global_avg_pooling.cc
@@ -14,4 +14,4 @@ void Register_GlobalAvgPooling(OperatorRegistry *op_registry) {
                     GlobalAvgPoolingOp<DeviceType::CPU, float>);
 }
 
-}  //  namespace mace
+}  // namespace mace
diff --git a/mace/ops/image_to_buffer.cc b/mace/ops/image_to_buffer.cc
index 88835145333d5eb9933b3b23af5cb0ad61a22943..d5031539d83ab330eaf0410e68063a16b4892b40 100644
--- a/mace/ops/image_to_buffer.cc
+++ b/mace/ops/image_to_buffer.cc
@@ -20,4 +20,4 @@ void Register_ImageToBuffer(OperatorRegistry *op_registry) {
                     ImageToBufferOp<DeviceType::OPENCL, half>);
 }
 
-}  //  namespace mace
+}  // namespace mace
diff --git a/mace/ops/image_to_buffer.h b/mace/ops/image_to_buffer.h
index 777919d4fb6e0918f92b6e6f1496d27b1d10d7fa..ab4cc5edc28d57a45a8d68a21bd6d1f11e677efb 100644
--- a/mace/ops/image_to_buffer.h
+++ b/mace/ops/image_to_buffer.h
@@ -34,5 +34,5 @@ class ImageToBufferOp: public Operator<D, T> {
   OP_OUTPUT_TAGS(OUTPUT);
 };
 
-} //  namespace mace
-#endif //  MACE_OPS_IMAGE_TO_BUFFER_H_
+}  // namespace mace
+#endif  // MACE_OPS_IMAGE_TO_BUFFER_H_
diff --git a/mace/ops/matmul.cc b/mace/ops/matmul.cc
index 37731fd7c3704b07a9da974f6aa0cd6884c465ee..e8a178cb053a92cf6237d274d8206f7d941c9c2f 100644
--- a/mace/ops/matmul.cc
+++ b/mace/ops/matmul.cc
@@ -26,4 +26,4 @@ void Register_MatMul(OperatorRegistry *op_registry) {
                     MatMulOp<DeviceType::OPENCL, half>);
 }
 
-}  //  namespace mace
+}  // namespace mace
diff --git a/mace/ops/ops_test_util.h b/mace/ops/ops_test_util.h
index e606c3a3ddcf47705ef237cdd1130b0d47b52fcf..15aa3bc9b9f62cfa766eaec7c324ecc8ae316935 100644
--- a/mace/ops/ops_test_util.h
+++ b/mace/ops/ops_test_util.h
@@ -405,4 +405,4 @@ void ImageToBuffer(OpsTestNet &net,
 
 }  // namespace mace
 
-#endif  //  MACE_OPS_TEST_UTIL_H_
+#endif  // MACE_OPS_TEST_UTIL_H_
diff --git a/mace/ops/pooling.cc b/mace/ops/pooling.cc
index 2ac3b9ace3d04ce1af987b916c7184eae89150b7..f761f5459ae260ba2352e8a759f002b35aa1df57 100644
--- a/mace/ops/pooling.cc
+++ b/mace/ops/pooling.cc
@@ -30,4 +30,4 @@ void Register_Pooling(OperatorRegistry *op_registry) {
                     PoolingOp<DeviceType::OPENCL, half>);
 }
 
-}  //  namespace mace
+}  // namespace mace
diff --git a/mace/ops/reshape.cc b/mace/ops/reshape.cc
index d72052713c13d76bee21d9a44291e2197b71ffd5..df528603537ab05087df3b7713180afb660eeed0 100644
--- a/mace/ops/reshape.cc
+++ b/mace/ops/reshape.cc
@@ -14,4 +14,4 @@ void Register_Reshape(OperatorRegistry *op_registry) {
                     ReshapeOp<DeviceType::CPU, float>);
 }
 
-}  //  namespace mace
+}  // namespace mace
diff --git a/mace/ops/reshape.h b/mace/ops/reshape.h
index 83f2cb60245e5605deb37ddd7ec5b5a9def722ad..46c8c875596b19573e9abe0b2d3b155a69630c4b 100644
--- a/mace/ops/reshape.h
+++ b/mace/ops/reshape.h
@@ -59,6 +59,6 @@ class ReshapeOp : public Operator<D, T> {
   OP_OUTPUT_TAGS(OUTPUT);
 };
 
-}  //  namespace mace
+}  // namespace mace
 
-#endif  //  MACE_OPS_RESHAPE_H_
+#endif  // MACE_OPS_RESHAPE_H_
diff --git a/mace/ops/resize_bilinear.cc b/mace/ops/resize_bilinear.cc
index c933dc876164227c658aa72cf8fc2a2e5e174248..d304c24cd4288821732b32ce547a01724efadc13 100644
--- a/mace/ops/resize_bilinear.cc
+++ b/mace/ops/resize_bilinear.cc
@@ -26,4 +26,4 @@ void Register_ResizeBilinear(OperatorRegistry *op_registry) {
                     ResizeBilinearOp<DeviceType::OPENCL, half>);
 }
 
-}  //  namespace mace
+}  // namespace mace
diff --git a/mace/ops/softmax.cc b/mace/ops/softmax.cc
index ac48b3d85901c7b99ca3abb9c0d185e4e5da2349..8742f020272e77273fb6ea2fab1d75cff8a87f31 100644
--- a/mace/ops/softmax.cc
+++ b/mace/ops/softmax.cc
@@ -26,4 +26,4 @@ void Register_Softmax(OperatorRegistry *op_registry) {
                     SoftmaxOp<DeviceType::OPENCL, half>);
 }
 
-}  //  namespace mace
+}  // namespace mace
diff --git a/mace/ops/softmax.h b/mace/ops/softmax.h
index 26914c6932396b2ed28a6243df66bced6805ddf1..cbce1d757df05ec7faafbd0bcb8e3e87866ebcdd 100644
--- a/mace/ops/softmax.h
+++ b/mace/ops/softmax.h
@@ -35,6 +35,6 @@ class SoftmaxOp : public Operator<D, T> {
   OP_OUTPUT_TAGS(OUTPUT);
 };
 
-}  //  namespace mace
+}  // namespace mace
 
-#endif  //  MACE_SOFTMAX_H_
+#endif  // MACE_SOFTMAX_H_
diff --git a/mace/ops/softmax_benchmark.cc b/mace/ops/softmax_benchmark.cc
index f2ccaf5b5d59a7b158faefbc133c072991fe9934..96f67368019d2f0b9bd5840e77abc3ea3dbc9339 100644
--- a/mace/ops/softmax_benchmark.cc
+++ b/mace/ops/softmax_benchmark.cc
@@ -65,4 +65,4 @@ BM_SOFTMAX(1, 3, 128, 128);
 BM_SOFTMAX(1, 3, 512, 512);
 BM_SOFTMAX(1, 32, 112, 112);
 BM_SOFTMAX(1, 64, 256, 256);
-}  //  namespace mace
+}  // namespace mace
diff --git a/mace/ops/space_to_batch.cc b/mace/ops/space_to_batch.cc
index 0e5c293dd8cf7cd9a032341c173107e38d26fc5e..89957f67bd838f910535a5bfceb64d2976c8876a 100644
--- a/mace/ops/space_to_batch.cc
+++ b/mace/ops/space_to_batch.cc
@@ -19,4 +19,4 @@ void Register_SpaceToBatchND(OperatorRegistry *op_registry) {
                     SpaceToBatchNDOp<DeviceType::OPENCL, half>);
 }
 
-}  //  namespace mace
+}  // namespace mace
diff --git a/mace/ops/winograd_inverse_transform.cc b/mace/ops/winograd_inverse_transform.cc
index 4f81a1b05929448a431436f7db841f8b2b77f457..677fe3e7905bac6c553e794bd28c998627faff08 100644
--- a/mace/ops/winograd_inverse_transform.cc
+++ b/mace/ops/winograd_inverse_transform.cc
@@ -19,4 +19,4 @@ void Register_WinogradInverseTransform(OperatorRegistry *op_registry) {
                     WinogradInverseTransformOp<DeviceType::OPENCL, half>);
 }
 
-}  //  namespace mace
+}  // namespace mace
diff --git a/mace/ops/winograd_transform.cc b/mace/ops/winograd_transform.cc
index 369a62188800e8873b9548c0abec69d0f8d8e8f5..e7cd86882a73ca967bfbfb587181cd6ae57ad70a 100644
--- a/mace/ops/winograd_transform.cc
+++ b/mace/ops/winograd_transform.cc
@@ -19,4 +19,4 @@ void Register_WinogradTransform(OperatorRegistry *op_registry) {
                     WinogradTransformOp<DeviceType::OPENCL, half>);
 }
 
-}  //  namespace mace
+}  // namespace mace
diff --git a/mace/utils/tuner.h b/mace/utils/tuner.h
index 184bec7bff86a9f58507ebe5d9b945a9966f5ed3..fee8cd95a27dd27c3773d133c2c098bc8a2257e4 100644
--- a/mace/utils/tuner.h
+++ b/mace/utils/tuner.h
@@ -180,5 +180,5 @@ class Tuner {
   std::unordered_map<std::string, std::vector<param_type>> param_table_;
 };
 
-}  //  namespace mace
-#endif  //  MACE_UTILS_TUNER_H_
+}  // namespace mace
+#endif  // MACE_UTILS_TUNER_H_
diff --git a/mace/utils/tuner_test.cc b/mace/utils/tuner_test.cc
index 0e57e929759aca6f23642ab96c158ef48baf87d1..6cd54c9f56b61fb95f05b4ea3219d912290603be 100644
--- a/mace/utils/tuner_test.cc
+++ b/mace/utils/tuner_test.cc
@@ -81,4 +81,4 @@ TEST_F(TunerTest, SimpleTune) {
   EXPECT_EQ(expect, res);
 }
 
-} //  namespace mace
+}  // namespace mace
diff --git a/mace/utils/utils.h b/mace/utils/utils.h
index fe30b9eb4e48b825ce380a4ff5a7925ee0e92c95..3f5c8ee0581063a3603965e717b5d9059a433180 100644
--- a/mace/utils/utils.h
+++ b/mace/utils/utils.h
@@ -94,5 +94,5 @@ inline std::string ObfuscateSymbol(const std::string &src) {
 #define MACE_OBFUSCATE_SYMBOL(str) (str)
 #endif
 
-}  //  namespace mace
-#endif  //  MACE_UTILS_UTILS_H_
+}  // namespace mace
+#endif  // MACE_UTILS_UTILS_H_
diff --git a/mace/utils/utils_test.cc b/mace/utils/utils_test.cc
index 0e57e929759aca6f23642ab96c158ef48baf87d1..6cd54c9f56b61fb95f05b4ea3219d912290603be 100644
--- a/mace/utils/utils_test.cc
+++ b/mace/utils/utils_test.cc
@@ -81,4 +81,4 @@ TEST_F(TunerTest, SimpleTune) {
   EXPECT_EQ(expect, res);
 }
 
-} //  namespace mace
+}  // namespace mace