diff --git a/src/bank.rs b/src/bank.rs
index 9c43946456..3b2ef23c98 100644
--- a/src/bank.rs
+++ b/src/bank.rs
@@ -15,8 +15,8 @@ use signature::{KeyPair, PublicKey, Signature};
 use std::collections::hash_map::Entry::Occupied;
 use std::collections::{HashMap, HashSet, VecDeque};
 use std::result;
-use std::sync::RwLock;
 use std::sync::atomic::{AtomicIsize, AtomicUsize, Ordering};
+use std::sync::RwLock;
 use transaction::{Instruction, Plan, Transaction};
 
 pub const MAX_ENTRY_IDS: usize = 1024 * 4;
diff --git a/src/banking_stage.rs b/src/banking_stage.rs
index 64a8fa6666..aed137d239 100644
--- a/src/banking_stage.rs
+++ b/src/banking_stage.rs
@@ -8,9 +8,9 @@ use rayon::prelude::*;
 use record_stage::Signal;
 use result::Result;
 use std::net::SocketAddr;
-use std::sync::Arc;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::mpsc::{channel, Receiver, Sender};
+use std::sync::Arc;
 use std::thread::{spawn, JoinHandle};
 use std::time::Duration;
 use std::time::Instant;
@@ -255,8 +255,8 @@ mod bench {
     use record_stage::Signal;
     use signature::{KeyPair, KeyPairUtil};
     use std::iter;
-    use std::sync::Arc;
     use std::sync::mpsc::channel;
+    use std::sync::Arc;
     use transaction::Transaction;
 
     #[bench]
diff --git a/src/bin/client-demo.rs b/src/bin/client-demo.rs
index 589a158cec..070fca2df8 100644
--- a/src/bin/client-demo.rs
+++ b/src/bin/client-demo.rs
@@ -24,8 +24,8 @@ use std::net::{IpAddr, SocketAddr, UdpSocket};
 use std::process::exit;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::{Arc, RwLock};
-use std::thread::JoinHandle;
 use std::thread::sleep;
+use std::thread::JoinHandle;
 use std::time::Duration;
 use std::time::Instant;
 
diff --git a/src/bin/fullnode.rs b/src/bin/fullnode.rs
index d0a4461530..8cf0dac0a6 100644
--- a/src/bin/fullnode.rs
+++ b/src/bin/fullnode.rs
@@ -20,8 +20,8 @@ use std::fs::File;
 use std::io::{stdin, Read};
 use std::net::{IpAddr, SocketAddr, UdpSocket};
 use std::process::exit;
-use std::sync::Arc;
 use std::sync::atomic::AtomicBool;
+use std::sync::Arc;
 //use std::time::Duration;
 
 fn print_usage(program: &str, opts: Options) {
diff --git a/src/entry_writer.rs b/src/entry_writer.rs
index 18a37481dc..0d174b3450 100644
--- a/src/entry_writer.rs
+++ b/src/entry_writer.rs
@@ -7,8 +7,8 @@ use packet;
 use result::Result;
 use serde_json;
 use std::collections::VecDeque;
-use std::io::Write;
 use std::io::sink;
+use std::io::Write;
 use std::sync::mpsc::Receiver;
 use std::sync::{Arc, Mutex};
 use std::time::Duration;
diff --git a/src/fetch_stage.rs b/src/fetch_stage.rs
index 71e633d67b..ad71882d73 100644
--- a/src/fetch_stage.rs
+++ b/src/fetch_stage.rs
@@ -2,9 +2,9 @@
 
 use packet;
 use std::net::UdpSocket;
-use std::sync::Arc;
 use std::sync::atomic::AtomicBool;
 use std::sync::mpsc::channel;
+use std::sync::Arc;
 use std::thread::JoinHandle;
 use streamer;
 
diff --git a/src/hash.rs b/src/hash.rs
index ee7598a0dc..61dd01468c 100644
--- a/src/hash.rs
+++ b/src/hash.rs
@@ -1,7 +1,7 @@
 //! The `hash` module provides functions for creating SHA-256 hashes.
 
-use generic_array::GenericArray;
 use generic_array::typenum::U32;
+use generic_array::GenericArray;
 use sha2::{Digest, Sha256};
 
 pub type Hash = GenericArray<u8, U32>;
diff --git a/src/replicate_stage.rs b/src/replicate_stage.rs
index 30ccf468f1..a3df0c4a32 100644
--- a/src/replicate_stage.rs
+++ b/src/replicate_stage.rs
@@ -4,8 +4,8 @@ use bank::Bank;
 use ledger;
 use packet;
 use result::Result;
-use std::sync::Arc;
 use std::sync::atomic::{AtomicBool, Ordering};
+use std::sync::Arc;
 use std::thread::{spawn, JoinHandle};
 use std::time::Duration;
 use streamer;
diff --git a/src/request_stage.rs b/src/request_stage.rs
index 33d845aab4..4c10659eec 100644
--- a/src/request_stage.rs
+++ b/src/request_stage.rs
@@ -8,9 +8,9 @@ use request::Request;
 use request_processor::RequestProcessor;
 use result::Result;
 use std::net::SocketAddr;
-use std::sync::Arc;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::mpsc::{channel, Receiver};
+use std::sync::Arc;
 use std::thread::{spawn, JoinHandle};
 use std::time::Instant;
 use streamer;
diff --git a/src/result.rs b/src/result.rs
index 5628490403..e31e45e2d1 100644
--- a/src/result.rs
+++ b/src/result.rs
@@ -80,9 +80,9 @@ mod tests {
     use std::io::Write;
     use std::net::SocketAddr;
     use std::panic;
+    use std::sync::mpsc::channel;
     use std::sync::mpsc::RecvError;
     use std::sync::mpsc::RecvTimeoutError;
-    use std::sync::mpsc::channel;
     use std::thread;
 
     fn addr_parse_error() -> Result<SocketAddr> {
diff --git a/src/rpu.rs b/src/rpu.rs
index eef1515d21..537b75c1ce 100644
--- a/src/rpu.rs
+++ b/src/rpu.rs
@@ -6,9 +6,9 @@ use packet;
 use request_processor::RequestProcessor;
 use request_stage::RequestStage;
 use std::net::UdpSocket;
-use std::sync::Arc;
 use std::sync::atomic::AtomicBool;
 use std::sync::mpsc::channel;
+use std::sync::Arc;
 use std::thread::JoinHandle;
 use streamer;
 
diff --git a/src/signature.rs b/src/signature.rs
index 51c38eb5cc..b32ccbdc3a 100644
--- a/src/signature.rs
+++ b/src/signature.rs
@@ -1,7 +1,7 @@
 //! The `signature` module provides functionality for public, and private keys.
 
-use generic_array::GenericArray;
 use generic_array::typenum::{U32, U64};
+use generic_array::GenericArray;
 use rand::{ChaChaRng, Rng, SeedableRng};
 use rayon::prelude::*;
 use ring::error::Unspecified;
diff --git a/src/streamer.rs b/src/streamer.rs
index 1f84a2af30..ef5b399e63 100644
--- a/src/streamer.rs
+++ b/src/streamer.rs
@@ -597,8 +597,8 @@ mod test {
     use std::sync::{Arc, RwLock};
     use std::thread::sleep;
     use std::time::Duration;
-    use streamer::{default_window, BlobReceiver, PacketReceiver};
     use streamer::{blob_receiver, receiver, responder, retransmitter, window};
+    use streamer::{default_window, BlobReceiver, PacketReceiver};
 
     fn get_msgs(r: PacketReceiver, num: &mut usize) {
         for _t in 0..5 {
diff --git a/src/thin_client.rs b/src/thin_client.rs
index 86e4585f63..7e20682cc0 100644
--- a/src/thin_client.rs
+++ b/src/thin_client.rs
@@ -183,8 +183,8 @@ mod tests {
     use server::Server;
     use signature::{KeyPair, KeyPairUtil};
     use std::io::sink;
-    use std::sync::Arc;
     use std::sync::atomic::{AtomicBool, Ordering};
+    use std::sync::Arc;
     use std::thread::sleep;
     use std::time::Duration;
     use transaction::{Instruction, Plan};
diff --git a/tests/multinode.rs b/tests/multinode.rs
index d602b8dd56..be4c469a7b 100644
--- a/tests/multinode.rs
+++ b/tests/multinode.rs
@@ -19,8 +19,8 @@ use std::io::sink;
 use std::net::UdpSocket;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::{Arc, RwLock};
-use std::thread::JoinHandle;
 use std::thread::sleep;
+use std::thread::JoinHandle;
 use std::time::Duration;
 
 fn validator(