diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Bookie.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Bookie.java
index 7e8452a2ca1..7f079f4a126 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Bookie.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Bookie.java
@@ -1558,25 +1558,25 @@ public static boolean format(ServerConfiguration conf,
                 LOG.error("Formatting journal directory failed");
                 return false;
             }
+        }
+
+        File[] ledgerDirs = conf.getLedgerDirs();
+        for (File dir : ledgerDirs) {
+            if (!cleanDir(dir)) {
+                LOG.error("Formatting ledger directory " + dir + " failed");
+                return false;
+            }
+        }
 
-            File[] ledgerDirs = conf.getLedgerDirs();
-            for (File dir : ledgerDirs) {
+        // Clean up index directories if they are separate from the ledger dirs
+        File[] indexDirs = conf.getIndexDirs();
+        if (null != indexDirs) {
+            for (File dir : indexDirs) {
                 if (!cleanDir(dir)) {
                     LOG.error("Formatting ledger directory " + dir + " failed");
                     return false;
                 }
             }
-
-            // Clean up index directories if they are separate from the ledger dirs
-            File[] indexDirs = conf.getIndexDirs();
-            if (null != indexDirs) {
-                for (File dir : indexDirs) {
-                    if (!cleanDir(dir)) {
-                        LOG.error("Formatting ledger directory " + dir + " failed");
-                        return false;
-                    }
-                }
-            }
         }
 
         LOG.info("Bookie format completed successfully");
diff --git a/site/_data/cli/shell.yaml b/site/_data/cli/shell.yaml
index 585947e5862..edd56ecb31a 100644
--- a/site/_data/cli/shell.yaml
+++ b/site/_data/cli/shell.yaml
@@ -187,9 +187,9 @@ commands:
     use this command to update ledger metadata by replacing src-bookie to dest-bookie where data has been copied/moved.
     Start the bookie process on dest-bookie and dest-bookie will serve copied ledger data from src-bookie.
   options:
-  - flag: -srcBookie <bookie-id>
+  - flag: -srcBookie BOOKIE_ID
     description: Source Bookie Id
-  - flag: -destBookie <bookie-id>
+  - flag: -destBookie BOOKIE_ID
     description: Destination Bookie Id
   - flag: -updatespersec N
     description: Number of ledgers updating per second (default 5 per sec)