diff --git a/benches/bank.rs b/benches/bank.rs
index eb2ece6b4..05f235c3c 100644
--- a/benches/bank.rs
+++ b/benches/bank.rs
@@ -1,8 +1,5 @@
 #![feature(test)]
 
-
-
-
 extern crate test;
 
 use solana::bank::*;
diff --git a/benches/banking_stage.rs b/benches/banking_stage.rs
index 05254651d..36dd0e2ce 100644
--- a/benches/banking_stage.rs
+++ b/benches/banking_stage.rs
@@ -1,9 +1,5 @@
 #![feature(test)]
 
-
-
-
-
 extern crate test;
 
 use rand::{thread_rng, Rng};
diff --git a/benches/db_ledger.rs b/benches/db_ledger.rs
index 7ee931652..5f2f8a6b7 100644
--- a/benches/db_ledger.rs
+++ b/benches/db_ledger.rs
@@ -1,7 +1,6 @@
 #![feature(test)]
 use rand;
 
-
 extern crate test;
 
 use rand::seq::SliceRandom;
diff --git a/benches/ledger.rs b/benches/ledger.rs
index 84e4b5941..f6969acbc 100644
--- a/benches/ledger.rs
+++ b/benches/ledger.rs
@@ -1,6 +1,5 @@
 #![feature(test)]
 
-
 extern crate test;
 
 use solana::entry::reconstruct_entries_from_blobs;
diff --git a/benches/signature.rs b/benches/signature.rs
index 0916bb49c..f4824f7e1 100644
--- a/benches/signature.rs
+++ b/benches/signature.rs
@@ -1,6 +1,5 @@
 #![feature(test)]
 
-
 extern crate test;
 
 use solana::signature::GenKeys;
diff --git a/benches/sigverify.rs b/benches/sigverify.rs
index d4fc446f3..72d580a79 100644
--- a/benches/sigverify.rs
+++ b/benches/sigverify.rs
@@ -1,7 +1,5 @@
 #![feature(test)]
 
-
-
 extern crate test;
 
 use solana::packet::to_packets;
diff --git a/src/bin/bench-streamer.rs b/src/bin/bench-streamer.rs
index a5732e780..4ec7921a8 100644
--- a/src/bin/bench-streamer.rs
+++ b/src/bin/bench-streamer.rs
@@ -1,6 +1,3 @@
-
-
-
 use clap::{App, Arg};
 use solana::netutil::bind_to;
 use solana::packet::{Packet, SharedPackets, BLOB_SIZE, PACKET_DATA_SIZE};
diff --git a/src/bin/bench-tps.rs b/src/bin/bench-tps.rs
index 62d02f782..b2d1c56a8 100644
--- a/src/bin/bench-tps.rs
+++ b/src/bin/bench-tps.rs
@@ -6,7 +6,6 @@ extern crate solana;
 
 use solana_metrics;
 
-
 use clap::{App, Arg};
 
 use rayon::prelude::*;
diff --git a/src/bin/fullnode-config.rs b/src/bin/fullnode-config.rs
index 4721d117e..fecf2d9a1 100644
--- a/src/bin/fullnode-config.rs
+++ b/src/bin/fullnode-config.rs
@@ -4,8 +4,6 @@ use dirs;
 
 use serde_json;
 
-
-
 use clap::{App, Arg};
 use ring::rand::SystemRandom;
 use ring::signature::Ed25519KeyPair;
diff --git a/src/bin/fullnode.rs b/src/bin/fullnode.rs
index e9e9bb5cd..7dac91f3f 100644
--- a/src/bin/fullnode.rs
+++ b/src/bin/fullnode.rs
@@ -8,7 +8,6 @@ use serde_json;
 extern crate solana;
 use solana_metrics;
 
-
 use clap::{App, Arg};
 use solana::client::mk_client;
 use solana::cluster_info::{Node, FULLNODE_PORT_RANGE};
diff --git a/src/bin/genesis.rs b/src/bin/genesis.rs
index 9f877d12e..6b922f59c 100644
--- a/src/bin/genesis.rs
+++ b/src/bin/genesis.rs
@@ -1,13 +1,9 @@
 //! A command-line executable for generating the chain's genesis block.
 
-
 #[macro_use]
 extern crate clap;
 use serde_json;
 
-
-
-
 use clap::{App, Arg};
 use solana::ledger::LedgerWriter;
 use solana::mint::Mint;
diff --git a/src/bin/keygen.rs b/src/bin/keygen.rs
index 2e42db56f..604e935cc 100644
--- a/src/bin/keygen.rs
+++ b/src/bin/keygen.rs
@@ -2,9 +2,6 @@
 extern crate clap;
 use dirs;
 
-
-
-
 use clap::{App, Arg};
 use solana::wallet::gen_keypair_file;
 use std::error;
diff --git a/src/bin/ledger-tool.rs b/src/bin/ledger-tool.rs
index 0081a9429..08ea437ec 100644
--- a/src/bin/ledger-tool.rs
+++ b/src/bin/ledger-tool.rs
@@ -2,7 +2,6 @@
 extern crate clap;
 use serde_json;
 
-
 use clap::{App, Arg, SubCommand};
 use solana::bank::Bank;
 use solana::ledger::{read_ledger, verify_ledger};
diff --git a/src/bin/replicator.rs b/src/bin/replicator.rs
index cdc8a8103..68ee096dd 100644
--- a/src/bin/replicator.rs
+++ b/src/bin/replicator.rs
@@ -5,8 +5,6 @@ use serde_json;
 #[macro_use]
 extern crate solana;
 
-
-
 use clap::{App, Arg};
 use solana::cluster_info::{Node, NodeInfo};
 use solana::fullnode::Config;
diff --git a/src/bin/wallet.rs b/src/bin/wallet.rs
index 091c8b9ef..1fba4712d 100644
--- a/src/bin/wallet.rs
+++ b/src/bin/wallet.rs
@@ -4,7 +4,6 @@ use dirs;
 #[macro_use]
 extern crate solana;
 
-
 use clap::{App, Arg, ArgMatches, SubCommand};
 use solana::logger;
 use solana::wallet::{gen_keypair_file, parse_command, process_command, WalletConfig, WalletError};
diff --git a/src/chacha_cuda.rs b/src/chacha_cuda.rs
index 08fc5d85f..32b6dde34 100644
--- a/src/chacha_cuda.rs
+++ b/src/chacha_cuda.rs
@@ -1,6 +1,8 @@
 use crate::chacha::{CHACHA_BLOCK_SIZE, CHACHA_KEY_SIZE};
 use crate::ledger::LedgerWindow;
-use crate::sigverify::{chacha_cbc_encrypt_many_sample, chacha_end_sha_state, chacha_init_sha_state};
+use crate::sigverify::{
+    chacha_cbc_encrypt_many_sample, chacha_end_sha_state, chacha_init_sha_state,
+};
 use solana_sdk::hash::Hash;
 use std::io;
 use std::mem::size_of;
diff --git a/src/db_window.rs b/src/db_window.rs
index e8bdeed6a..074f31f93 100644
--- a/src/db_window.rs
+++ b/src/db_window.rs
@@ -3,12 +3,12 @@ use crate::cluster_info::ClusterInfo;
 use crate::counter::Counter;
 use crate::db_ledger::*;
 use crate::entry::Entry;
+#[cfg(feature = "erasure")]
+use crate::erasure;
 use crate::leader_scheduler::LeaderScheduler;
 use crate::packet::{SharedBlob, BLOB_HEADER_SIZE};
 use crate::result::Result;
 use crate::streamer::BlobSender;
-#[cfg(feature = "erasure")]
-use crate::erasure;
 use log::Level;
 use rocksdb::DBRawIterator;
 use solana_metrics::{influxdb, submit};
@@ -400,15 +400,15 @@ fn try_erasure(db_ledger: &mut DbLedger, slot: u64, consume_queue: &mut Vec<Entr
 #[cfg(test)]
 mod test {
     use super::*;
-    use crate::ledger::{get_tmp_ledger_path, make_tiny_test_entries, Block};
-    use crate::packet::{Blob, Packet, Packets, SharedBlob, PACKET_DATA_SIZE};
-    use crate::streamer::{receiver, responder, PacketReceiver};
     #[cfg(all(feature = "erasure", test))]
     use crate::entry::reconstruct_entries_from_blobs;
     #[cfg(all(feature = "erasure", test))]
     use crate::erasure::test::{generate_db_ledger_from_window, setup_window_ledger};
     #[cfg(all(feature = "erasure", test))]
     use crate::erasure::{NUM_CODING, NUM_DATA};
+    use crate::ledger::{get_tmp_ledger_path, make_tiny_test_entries, Block};
+    use crate::packet::{Blob, Packet, Packets, SharedBlob, PACKET_DATA_SIZE};
+    use crate::streamer::{receiver, responder, PacketReceiver};
     use rocksdb::{Options, DB};
     use solana_sdk::signature::{Keypair, KeypairUtil};
     use std::io;
diff --git a/src/erasure.rs b/src/erasure.rs
index c504bffdd..45d0ac244 100644
--- a/src/erasure.rs
+++ b/src/erasure.rs
@@ -3,10 +3,10 @@ use crate::db_ledger::DbLedger;
 use crate::db_window::{find_missing_coding_indexes, find_missing_data_indexes};
 use crate::packet::{Blob, SharedBlob, BLOB_DATA_SIZE, BLOB_HEADER_SIZE, BLOB_SIZE};
 use crate::result::{Error, Result};
+use crate::window::WindowSlot;
 use solana_sdk::pubkey::Pubkey;
 use std::cmp;
 use std::sync::{Arc, RwLock};
-use crate::window::WindowSlot;
 
 //TODO(sakridge) pick these values
 pub const NUM_DATA: usize = 16; // number of data blobs
@@ -558,10 +558,10 @@ pub mod test {
     use crate::ledger::{get_tmp_ledger_path, make_tiny_test_entries, Block};
     use crate::logger;
     use crate::packet::{index_blobs, SharedBlob, BLOB_DATA_SIZE, BLOB_SIZE};
+    use crate::window::WindowSlot;
     use rand::{thread_rng, Rng};
     use solana_sdk::pubkey::Pubkey;
     use solana_sdk::signature::{Keypair, KeypairUtil};
-    use crate::window::WindowSlot;
 
     #[test]
     pub fn test_coding() {
diff --git a/src/lib.rs b/src/lib.rs
index 7b3dbd2ca..528703c06 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -98,4 +98,3 @@ use solana_jsonrpc_ws_server as jsonrpc_ws_server;
 #[cfg(test)]
 #[macro_use]
 extern crate matches;
-
diff --git a/src/logger.rs b/src/logger.rs
index 5948f9fdf..2b0e469f2 100644
--- a/src/logger.rs
+++ b/src/logger.rs
@@ -1,8 +1,8 @@
 //! The `logger` module provides a setup function for `env_logger`. Its only function,
 //! `setup()` may be called multiple times.
 
-use std::sync::{Once, ONCE_INIT};
 use env_logger;
+use std::sync::{Once, ONCE_INIT};
 
 static INIT: Once = ONCE_INIT;
 
diff --git a/src/replicator.rs b/src/replicator.rs
index b4ec45dce..72ffa0fa9 100644
--- a/src/replicator.rs
+++ b/src/replicator.rs
@@ -1,4 +1,6 @@
 use crate::blob_fetch_stage::BlobFetchStage;
+#[cfg(feature = "chacha")]
+use crate::chacha::{chacha_cbc_encrypt_file, CHACHA_BLOCK_SIZE};
 use crate::client::mk_client;
 use crate::cluster_info::{ClusterInfo, Node, NodeInfo};
 use crate::db_ledger::DbLedger;
@@ -12,8 +14,6 @@ use crate::store_ledger_stage::StoreLedgerStage;
 use crate::streamer::BlobReceiver;
 use crate::window;
 use crate::window_service::window_service;
-#[cfg(feature = "chacha")]
-use crate::chacha::{chacha_cbc_encrypt_file, CHACHA_BLOCK_SIZE};
 use rand::thread_rng;
 use rand::Rng;
 use solana_drone::drone::{request_airdrop_transaction, DRONE_PORT};
diff --git a/src/result.rs b/src/result.rs
index b3a319992..d4966892a 100644
--- a/src/result.rs
+++ b/src/result.rs
@@ -3,12 +3,12 @@
 use crate::bank;
 use crate::cluster_info;
 use crate::db_ledger;
+#[cfg(feature = "erasure")]
+use crate::erasure;
 use crate::packet;
 use crate::poh_recorder;
 use crate::vote_stage;
 use bincode;
-#[cfg(feature = "erasure")]
-use crate::erasure;
 use rocksdb;
 use serde_json;
 use std;
diff --git a/src/storage_stage.rs b/src/storage_stage.rs
index d198d350b..b88094e5f 100644
--- a/src/storage_stage.rs
+++ b/src/storage_stage.rs
@@ -2,11 +2,11 @@
 // for storage mining. Replicators submit storage proofs, validator then bundles them
 // to submit its proof for mining to be rewarded.
 
+#[cfg(all(feature = "chacha", feature = "cuda"))]
+use crate::chacha_cuda::chacha_cbc_encrypt_file_many_keys;
 use crate::entry::EntryReceiver;
 use crate::result::{Error, Result};
 use crate::service::Service;
-#[cfg(all(feature = "chacha", feature = "cuda"))]
-use crate::chacha_cuda::chacha_cbc_encrypt_file_many_keys;
 use rand::{Rng, SeedableRng};
 use rand_chacha::ChaChaRng;
 use solana_sdk::hash::Hash;
diff --git a/src/wallet.rs b/src/wallet.rs
index 64a0f0f8b..2f6bf6a35 100644
--- a/src/wallet.rs
+++ b/src/wallet.rs
@@ -727,7 +727,10 @@ fn confirm_tx(
     }
 }
 
-fn send_and_confirm_tx(rpc_client: &RpcClient, tx: &Transaction) -> Result<(), Box<dyn error::Error>> {
+fn send_and_confirm_tx(
+    rpc_client: &RpcClient,
+    tx: &Transaction,
+) -> Result<(), Box<dyn error::Error>> {
     let mut send_retries = 3;
     while send_retries > 0 {
         let mut status_retries = 4;
diff --git a/tests/data_replicator.rs b/tests/data_replicator.rs
index 079519e7a..dd7c11a34 100644
--- a/tests/data_replicator.rs
+++ b/tests/data_replicator.rs
@@ -1,9 +1,6 @@
 #[macro_use]
 extern crate log;
 
-
-
-
 use rayon::iter::*;
 use solana::cluster_info::{ClusterInfo, Node};
 use solana::gossip_service::GossipService;
diff --git a/tests/multinode.rs b/tests/multinode.rs
index e9f4a3fc0..8f232737f 100644
--- a/tests/multinode.rs
+++ b/tests/multinode.rs
@@ -1,11 +1,8 @@
 #[macro_use]
 extern crate log;
 
-
-
 use solana;
 
-
 use solana::blob_fetch_stage::BlobFetchStage;
 use solana::cluster_info::{ClusterInfo, Node, NodeInfo};
 use solana::contact_info::ContactInfo;
diff --git a/tests/programs.rs b/tests/programs.rs
index 20f4fe1b2..a76de5508 100644
--- a/tests/programs.rs
+++ b/tests/programs.rs
@@ -1,10 +1,6 @@
-
-
-
 use solana;
 use solana_native_loader;
 
-
 use solana::bank::Bank;
 use solana::logger;
 use solana::mint::Mint;
diff --git a/tests/replicator.rs b/tests/replicator.rs
index ae3779326..f1a25212b 100644
--- a/tests/replicator.rs
+++ b/tests/replicator.rs
@@ -1,8 +1,6 @@
 #[macro_use]
 extern crate log;
 
-
-
 use solana::client::mk_client;
 use solana::cluster_info::{Node, NodeInfo};
 use solana::db_ledger::DbLedger;