diff --git a/svf-llvm/lib/LLVMModule.cpp b/svf-llvm/lib/LLVMModule.cpp
index 8174493f6..015ecd05d 100644
--- a/svf-llvm/lib/LLVMModule.cpp
+++ b/svf-llvm/lib/LLVMModule.cpp
@@ -1255,7 +1255,7 @@ void LLVMModuleSet::setValueAttr(const Value* val, SVFValue* svfvalue)
 }
 
 void LLVMModuleSet::addToLLVMVal2SVFVarMap(const Value* val,
-                                           SVFBaseNode* svfBaseNode)
+        SVFBaseNode* svfBaseNode)
 {
     SVFBaseNode2LLVMValue[svfBaseNode] = val;
     svfBaseNode->setSourceLoc(LLVMUtil::getSourceLoc(val));
diff --git a/svf/include/SVFIR/SVFIR.h b/svf/include/SVFIR/SVFIR.h
index 913ce3d7f..d90a16a64 100644
--- a/svf/include/SVFIR/SVFIR.h
+++ b/svf/include/SVFIR/SVFIR.h
@@ -417,7 +417,7 @@ class SVFIR : public IRGraph
         const SVFVar* node = getGNode(id);
         if(const GepValVar* gepVar = SVFUtil::dyn_cast<GepValVar>(node))
             return SVFUtil::dyn_cast<ValVar>(
-                getGNode(gepVar->getBaseNode()));
+                       getGNode(gepVar->getBaseNode()));
         else
             return SVFUtil::dyn_cast<ValVar>(node);
     }
@@ -656,7 +656,8 @@ class SVFIR : public IRGraph
     }
 
 
-    inline NodeID addConstantIntObjNode(const SVFValue* curInst, s64_t sval, u64_t zval, const NodeID i) {
+    inline NodeID addConstantIntObjNode(const SVFValue* curInst, s64_t sval, u64_t zval, const NodeID i)
+    {
         const MemObj* mem = getMemObj(curInst);
         NodeID base = mem->getId();
         memToFieldsMap[base].set(mem->getId());
@@ -666,7 +667,8 @@ class SVFIR : public IRGraph
     }
 
 
-    inline NodeID addConstantNullPtrObjNode(const SVFValue* curInst, const NodeID i) {
+    inline NodeID addConstantNullPtrObjNode(const SVFValue* curInst, const NodeID i)
+    {
         const MemObj* mem = getMemObj(curInst);
         NodeID base = mem->getId();
         memToFieldsMap[base].set(mem->getId());
diff --git a/svf/include/SVFIR/SVFVariables.h b/svf/include/SVFIR/SVFVariables.h
index 81d86187b..1cf11ef2d 100644
--- a/svf/include/SVFIR/SVFVariables.h
+++ b/svf/include/SVFIR/SVFVariables.h
@@ -949,7 +949,8 @@ class BlackHoleVar: public ConstantDataValVar
 
     }
 
-    virtual const std::string toString() const {
+    virtual const std::string toString() const
+    {
         return "BlackHoleVar";
     }
 };
@@ -1109,7 +1110,8 @@ class ConstantNullPtrValVar: public ConstantDataValVar
     virtual const std::string toString() const;
 };
 
-class GlobalObjVar : public BaseObjVar {
+class GlobalObjVar : public BaseObjVar
+{
     friend class SVFIRWriter;
     friend class SVFIRReader;
 
@@ -1148,7 +1150,8 @@ class GlobalObjVar : public BaseObjVar {
 
     /// Constructor
     GlobalObjVar(const SVFValue* val, NodeID i, const MemObj* mem,
-                 PNODEK ty = GlobalObjNode): BaseObjVar(val, i,mem,ty){
+                 PNODEK ty = GlobalObjNode): BaseObjVar(val, i,mem,ty)
+    {
 
     }
 
@@ -1156,7 +1159,8 @@ class GlobalObjVar : public BaseObjVar {
     virtual const std::string toString() const;
 };
 
-class ConstantDataObjVar: public BaseObjVar {
+class ConstantDataObjVar: public BaseObjVar
+{
     friend class SVFIRWriter;
     friend class SVFIRReader;
 
@@ -1224,7 +1228,8 @@ class ConstantFPObjVar: public ConstantDataObjVar
     {
         return node->getNodeKind() == SVFVar::ConstantFPObjNode;
     }
-    static inline bool classof(const BaseObjVar* node) {
+    static inline bool classof(const BaseObjVar* node)
+    {
         return node->getNodeKind() == SVFVar::ConstantFPObjNode;
     }
 
diff --git a/svf/lib/MemoryModel/PointerAnalysis.cpp b/svf/lib/MemoryModel/PointerAnalysis.cpp
index 73eb743a6..d95d1d2d8 100644
--- a/svf/lib/MemoryModel/PointerAnalysis.cpp
+++ b/svf/lib/MemoryModel/PointerAnalysis.cpp
@@ -447,7 +447,7 @@ void PointerAnalysis::getVFnsFromPts(const CallICFGNode* cs, const PointsTo &tar
             if (ptdnode->hasValue())
             {
                 if ((isa<ObjVar>(ptdnode) && isa<GlobalObjVar>(pag->getBaseObject(ptdnode->getId())))
-                    || (isa<ValVar>(ptdnode) && isa<GlobalValVar>(pag->getBaseValVar(ptdnode->getId()))))
+                        || (isa<ValVar>(ptdnode) && isa<GlobalValVar>(pag->getBaseValVar(ptdnode->getId()))))
                 {
                     const SVFGlobalValue* globalValue = SVFUtil::dyn_cast<SVFGlobalValue>(ptdnode->getValue());
                     if (chaVtbls.find(globalValue) != chaVtbls.end())
diff --git a/svf/lib/SABER/SaberSVFGBuilder.cpp b/svf/lib/SABER/SaberSVFGBuilder.cpp
index bca50e7ea..d5a7163ee 100644
--- a/svf/lib/SABER/SaberSVFGBuilder.cpp
+++ b/svf/lib/SABER/SaberSVFGBuilder.cpp
@@ -83,7 +83,7 @@ void SaberSVFGBuilder::collectGlobals(BVDataPTAImpl* pta)
                 continue;
         }
         if ((isa<ObjVar>(pagNode) && isa<GlobalObjVar>(pag->getBaseObject(pagNode->getId()))) ||
-            (isa<ValVar>(pagNode) && isa<GlobalValVar>(pag->getBaseValVar(pagNode->getId()))))
+                (isa<ValVar>(pagNode) && isa<GlobalValVar>(pag->getBaseValVar(pagNode->getId()))))
             worklist.push_back(it->first);
     }
 
diff --git a/svf/lib/SVFIR/SVFVariables.cpp b/svf/lib/SVFIR/SVFVariables.cpp
index 80471d233..4cbb9c9a0 100644
--- a/svf/lib/SVFIR/SVFVariables.cpp
+++ b/svf/lib/SVFIR/SVFVariables.cpp
@@ -40,7 +40,7 @@ using namespace SVFUtil;
  * SVFVar constructor
  */
 SVFVar::SVFVar(const SVFValue* val, NodeID i, PNODEK k) :
-      GenericPAGNodeTy(i,k), value(val), func(nullptr)
+    GenericPAGNodeTy(i,k), value(val), func(nullptr)
 {
     assert( ValNode <= k && k <= DummyObjNode && "new SVFIR node kind?");
     switch (k)
@@ -262,7 +262,8 @@ const std::string FunValVar::toString() const
     return rawstr.str();
 }
 
-const std::string ConstantDataValVar::toString() const {
+const std::string ConstantDataValVar::toString() const
+{
     std::string str;
     std::stringstream rawstr(str);
     rawstr << "ConstantDataValNode ID: " << getId();
@@ -274,7 +275,8 @@ const std::string ConstantDataValVar::toString() const {
     return rawstr.str();
 }
 
-const std::string GlobalValVar::toString() const {
+const std::string GlobalValVar::toString() const
+{
     std::string str;
     std::stringstream rawstr(str);
     rawstr << "GlobalValVar ID: " << getId();
@@ -286,7 +288,8 @@ const std::string GlobalValVar::toString() const {
     return rawstr.str();
 }
 
-const std::string ConstantFPValVar::toString() const {
+const std::string ConstantFPValVar::toString() const
+{
     std::string str;
     std::stringstream rawstr(str);
     rawstr << "ConstantFPValNode ID: " << getId();
@@ -298,7 +301,8 @@ const std::string ConstantFPValVar::toString() const {
     return rawstr.str();
 }
 
-const std::string ConstantIntValVar::toString() const {
+const std::string ConstantIntValVar::toString() const
+{
     std::string str;
     std::stringstream rawstr(str);
     rawstr << "ConstantIntValNode ID: " << getId();
@@ -310,7 +314,8 @@ const std::string ConstantIntValVar::toString() const {
     return rawstr.str();
 }
 
-const std::string ConstantNullPtrValVar::toString() const {
+const std::string ConstantNullPtrValVar::toString() const
+{
     std::string str;
     std::stringstream rawstr(str);
     rawstr << "ConstantNullPtrValVar ID: " << getId();
@@ -322,7 +327,8 @@ const std::string ConstantNullPtrValVar::toString() const {
     return rawstr.str();
 }
 
-const std::string GlobalObjVar::toString() const {
+const std::string GlobalObjVar::toString() const
+{
     std::string str;
     std::stringstream rawstr(str);
     rawstr << "GlobalObjNode ID: " << getId();
@@ -334,7 +340,8 @@ const std::string GlobalObjVar::toString() const {
     return rawstr.str();
 }
 
-const std::string ConstantDataObjVar::toString() const {
+const std::string ConstantDataObjVar::toString() const
+{
     std::string str;
     std::stringstream rawstr(str);
     rawstr << "ConstantDataObjVar ID: " << getId();
@@ -346,7 +353,8 @@ const std::string ConstantDataObjVar::toString() const {
     return rawstr.str();
 }
 
-const std::string ConstantFPObjVar::toString() const {
+const std::string ConstantFPObjVar::toString() const
+{
     std::string str;
     std::stringstream rawstr(str);
     rawstr << "ConstantFPObjVar ID: " << getId();
@@ -358,7 +366,8 @@ const std::string ConstantFPObjVar::toString() const {
     return rawstr.str();
 }
 
-const std::string ConstantIntObjVar::toString() const {
+const std::string ConstantIntObjVar::toString() const
+{
     std::string str;
     std::stringstream rawstr(str);
     rawstr << "ConstantIntObjVar ID: " << getId();
@@ -370,7 +379,8 @@ const std::string ConstantIntObjVar::toString() const {
     return rawstr.str();
 }
 
-const std::string ConstantNullPtrObjVar::toString() const {
+const std::string ConstantNullPtrObjVar::toString() const
+{
     std::string str;
     std::stringstream rawstr(str);
     rawstr << "ConstantNullPtrObjVar ID: " << getId();