diff --git a/src/fullnode.rs b/src/fullnode.rs
index 5eb8bff115..7fed0fe123 100644
--- a/src/fullnode.rs
+++ b/src/fullnode.rs
@@ -127,13 +127,8 @@ impl Fullnode {
         let leader_scheduler = Arc::new(RwLock::new(LeaderScheduler::new(
             &config.leader_scheduler_config,
         )));
-        let (
-            bank,
-            entry_height,
-            last_entry_id,
-            blocktree,
-            ledger_signal_receiver,
-        ) = new_bank_from_ledger(ledger_path, &config.ledger_config(), &leader_scheduler);
+        let (bank, entry_height, last_entry_id, blocktree, ledger_signal_receiver) =
+            new_bank_from_ledger(ledger_path, &config.ledger_config(), &leader_scheduler);
 
         info!("node info: {:?}", node.info);
         info!("node entrypoint_info: {:?}", entrypoint_info_option);
@@ -458,13 +453,7 @@ fn new_banks_from_blocktree(
     blocktree_path: &str,
     blocktree_config: &BlocktreeConfig,
     leader_scheduler: &Arc<RwLock<LeaderScheduler>>,
-) -> (
-    BankForks,
-    u64,
-    Hash,
-    Blocktree,
-    Receiver<bool>,
-) {
+) -> (BankForks, u64, Hash, Blocktree, Receiver<bool>) {
     let (blocktree, ledger_signal_receiver) =
         Blocktree::open_with_config_signal(blocktree_path, blocktree_config)
             .expect("Expected to successfully open database ledger");
@@ -503,20 +492,9 @@ pub fn new_bank_from_ledger(
     ledger_path: &str,
     ledger_config: &BlocktreeConfig,
     leader_scheduler: &Arc<RwLock<LeaderScheduler>>,
-) -> (
-    Arc<Bank>,
-    u64,
-    Hash,
-    Blocktree,
-    Receiver<bool>,
-) {
-    let (
-        bank_forks,
-        entry_height,
-        last_entry_id,
-        blocktree,
-        ledger_signal_receiver,
-    ) = new_banks_from_blocktree(ledger_path, ledger_config, leader_scheduler);
+) -> (Arc<Bank>, u64, Hash, Blocktree, Receiver<bool>) {
+    let (bank_forks, entry_height, last_entry_id, blocktree, ledger_signal_receiver) =
+        new_banks_from_blocktree(ledger_path, ledger_config, leader_scheduler);
     (
         bank_forks.working_bank(),
         entry_height,
diff --git a/src/replay_stage.rs b/src/replay_stage.rs
index fe5e1f0c38..3959a6bfba 100644
--- a/src/replay_stage.rs
+++ b/src/replay_stage.rs
@@ -6,7 +6,6 @@ use crate::blocktree_processor;
 use crate::cluster_info::ClusterInfo;
 use crate::counter::Counter;
 use crate::entry::{Entry, EntryReceiver, EntrySender, EntrySlice};
-use std::sync::mpsc::RecvTimeoutError;
 use crate::leader_scheduler::LeaderScheduler;
 use crate::packet::BlobError;
 use crate::result::{Error, Result};
@@ -20,6 +19,7 @@ use solana_sdk::pubkey::Pubkey;
 use solana_sdk::timing::duration_as_ms;
 use solana_sdk::vote_transaction::VoteTransaction;
 use std::sync::atomic::{AtomicBool, Ordering};
+use std::sync::mpsc::RecvTimeoutError;
 use std::sync::mpsc::{channel, Receiver};
 use std::sync::{Arc, RwLock};
 #[cfg(test)]
@@ -559,12 +559,11 @@ mod test {
         let (to_leader_sender, _) = channel();
         {
             let leader_scheduler = Arc::new(RwLock::new(LeaderScheduler::default()));
-            let (bank, entry_height, last_entry_id, blocktree, l_receiver) =
-                new_bank_from_ledger(
-                    &my_ledger_path,
-                    &BlocktreeConfig::default(),
-                    &leader_scheduler,
-                );
+            let (bank, entry_height, last_entry_id, blocktree, l_receiver) = new_bank_from_ledger(
+                &my_ledger_path,
+                &BlocktreeConfig::default(),
+                &leader_scheduler,
+            );
 
             let blocktree = Arc::new(blocktree);
             let (replay_stage, ledger_writer_recv) = ReplayStage::new(