diff --git a/tools/rewriter/GenCallAsm.cpp b/tools/rewriter/GenCallAsm.cpp
index 74d671617..e7db75eac 100644
--- a/tools/rewriter/GenCallAsm.cpp
+++ b/tools/rewriter/GenCallAsm.cpp
@@ -357,7 +357,7 @@ static void emit_switch_stacks(AsmWriter &aw, int old_pkey, int new_pkey, Arch a
     add_asm_line(aw, "add x10, x10, x9");
     // Tag the pointer with the old pkey
     if (old_pkey != 0) {
-            add_asm_line(aw, llvm::formatv("orr x10, x10, #{0:x}00000000000000", old_pkey));
+      add_asm_line(aw, llvm::formatv("orr x10, x10, #{0:x}00000000000000", old_pkey));
     }
     add_comment_line(aw, "Write old stack pointer to memory");
     // Keep the old stack pointer in x12
@@ -370,7 +370,7 @@ static void emit_switch_stacks(AsmWriter &aw, int old_pkey, int new_pkey, Arch a
     add_asm_line(aw, "add x10, x10, x9");
     // Tag the pointer with the new pkey
     if (new_pkey != 0) {
-            add_asm_line(aw, llvm::formatv("orr x10, x10, #{0:x}00000000000000", new_pkey));
+      add_asm_line(aw, llvm::formatv("orr x10, x10, #{0:x}00000000000000", new_pkey));
     }
     add_comment_line(aw, "Read new stack pointer from memory");
     add_asm_line(aw, "ldr x11, [x10]");
diff --git a/tools/rewriter/SourceRewriter.cpp b/tools/rewriter/SourceRewriter.cpp
index 23ea9735d..3d183eac3 100644
--- a/tools/rewriter/SourceRewriter.cpp
+++ b/tools/rewriter/SourceRewriter.cpp
@@ -66,7 +66,7 @@ struct DirectoryParser : public llvm::cl::parser<std::string> {
   bool parse(llvm::cl::Option &O, llvm::StringRef ArgName, const llvm::StringRef &ArgValue,
              std::string &Value) {
     llvm::cl::parser<std::string>::parse(O, ArgName, ArgValue, Value);
-    llvm::SmallString<PATH_MAX> dir { llvm::StringRef(Value) };
+    llvm::SmallString<PATH_MAX> dir{llvm::StringRef(Value)};
     bool exists = llvm::sys::fs::is_directory(dir);
     if (!exists) {
       llvm::errs() << "error: directory does not exist: " << dir << "\n";
@@ -1053,7 +1053,7 @@ std::optional<Pkey> pkey_from_commands(std::function<std::optional<std::vector<C
     comp_cmds.resize(1);
   }
   assert(comp_cmds.size() == 1);
-  
+
   auto cc_cmd = *comp_cmd_with_pkey;
 
   auto pkey_define = std::find_if(cc_cmd.CommandLine.begin(),
@@ -1163,7 +1163,7 @@ int main(int argc, const char **argv) {
   if (!(config_0 || config_1)) {
     llvm::errs() << "Error in pkey configuration. The following pkeys were used: [";
     bool first = true;
-    for (const Pkey& pkey : pkeys_used) {
+    for (const Pkey &pkey : pkeys_used) {
       if (!first) {
         llvm::errs() << ", ";
       }
@@ -1432,7 +1432,7 @@ int main(int argc, const char **argv) {
   // Define wrappers for function pointers (i.e. those referenced by IA2_FN)
   for (const auto &[fn_name, opaque] : ptr_expr_pass.addr_taken_fns) {
     if (generated_wrappers.contains(fn_name)) {
-        continue;
+      continue;
     }
     llvm::errs() << " inserting " << fn_name << " into set\n";
     generated_wrappers.insert(fn_name);