diff --git a/src/common/base/StringView.hpp b/src/common/base/StringView.hpp
index 26510d002..3d349c1cc 100644
--- a/src/common/base/StringView.hpp
+++ b/src/common/base/StringView.hpp
@@ -131,7 +131,9 @@ class WCDB_API UnsafeStringView {
     };
 
     template<typename T>
-    struct Convertible<T, std::enable_if_t<std::is_function<T>::value>> : public std::false_type {};
+    struct Convertible<T, std::enable_if_t<std::is_function<T>::value>>
+    : public std::false_type {
+    };
 
     template<typename T, typename Enable = typename std::enable_if<Convertible<T>::value>::type>
     UnsafeStringView(const T& t)
diff --git a/src/common/core/fts/tokenizer/TokenizerModule.cpp b/src/common/core/fts/tokenizer/TokenizerModule.cpp
index c07afafd6..fc4f37ea4 100644
--- a/src/common/core/fts/tokenizer/TokenizerModule.cpp
+++ b/src/common/core/fts/tokenizer/TokenizerModule.cpp
@@ -36,14 +36,14 @@ namespace WCDB {
 #endif
 
 #pragma mark - AbstractFTS5Tokenizer
-AbstractFTSTokenizer::AbstractFTSTokenizer(const char *const *azArg, int nArg, void *pCtx){
+AbstractFTSTokenizer::AbstractFTSTokenizer(const char *const *azArg, int nArg, void *pCtx)
+{
     WCDB_UNUSED(pCtx);
     WCDB_UNUSED(azArg);
     WCDB_UNUSED(nArg);
 }
 
-AbstractFTSTokenizer::~AbstractFTSTokenizer()
-= default;
+AbstractFTSTokenizer::~AbstractFTSTokenizer() = default;
 
 struct FTS3TokenizerWrap {
     sqlite3_tokenizer base;
diff --git a/src/common/utility/Macro.h b/src/common/utility/Macro.h
index 08fe1a547..3cde41cb0 100644
--- a/src/common/utility/Macro.h
+++ b/src/common/utility/Macro.h
@@ -116,7 +116,7 @@
 #if !defined(_WIN32)
 #define WCDB_UNUSED(variable) _Pragma(WCDB_STRINGIFY(unused(variable)))
 #else
-#define WCDB_UNUSED(variable) (void)(variable)
+#define WCDB_UNUSED(variable) (void) (variable)
 #endif
 
 #ifdef __clang__
diff --git a/src/common/winq/extension/ColumnType.hpp b/src/common/winq/extension/ColumnType.hpp
index f4387cc7e..b4305e0bb 100644
--- a/src/common/winq/extension/ColumnType.hpp
+++ b/src/common/winq/extension/ColumnType.hpp
@@ -261,7 +261,9 @@ struct WCDB_API ColumnIsTextType<StringView> : public std::true_type {
 };
 
 template<typename T>
-struct ColumnIsTextType<T, std::enable_if_t<std::is_function<T>::value>> : public std::false_type {};
+struct ColumnIsTextType<T, std::enable_if_t<std::is_function<T>::value>>
+: public std::false_type {
+};
 
 //BLOB
 template<>