diff --git a/src/accountant.rs b/src/accountant.rs
index 5f599bf93..7c8a5e5c4 100644
--- a/src/accountant.rs
+++ b/src/accountant.rs
@@ -259,9 +259,9 @@ impl Accountant {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use signature::KeyPairUtil;
-    use hash::hash;
     use bincode::serialize;
+    use hash::hash;
+    use signature::KeyPairUtil;
 
     #[test]
     fn test_accountant() {
@@ -412,9 +412,9 @@ mod bench {
     extern crate test;
     use self::test::Bencher;
     use accountant::*;
-    use signature::KeyPairUtil;
-    use hash::hash;
     use bincode::serialize;
+    use hash::hash;
+    use signature::KeyPairUtil;
 
     #[bench]
     fn process_verified_event_bench(bencher: &mut Bencher) {
diff --git a/src/accountant_skel.rs b/src/accountant_skel.rs
index d827b2d5a..e45efb83e 100644
--- a/src/accountant_skel.rs
+++ b/src/accountant_skel.rs
@@ -4,9 +4,9 @@
 
 use accountant::Accountant;
 use bincode::{deserialize, serialize};
+use ecdsa;
 use entry::Entry;
 use event::Event;
-use ecdsa;
 use hash::Hash;
 use historian::Historian;
 use packet;
diff --git a/src/ecdsa.rs b/src/ecdsa.rs
index f3ede709b..9594d0167 100644
--- a/src/ecdsa.rs
+++ b/src/ecdsa.rs
@@ -8,9 +8,9 @@ use std::mem::size_of;
 #[cfg(not(feature = "cuda"))]
 use rayon::prelude::*;
 #[cfg(not(feature = "cuda"))]
-use untrusted;
-#[cfg(not(feature = "cuda"))]
 use ring::signature;
+#[cfg(not(feature = "cuda"))]
+use untrusted;
 
 // Shared imports
 use packet::{Packet, SharedPackets};
diff --git a/src/lib.rs b/src/lib.rs
index 1c8ed2eba..706e61fb8 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -2,9 +2,9 @@
 pub mod accountant;
 pub mod accountant_skel;
 pub mod accountant_stub;
+pub mod ecdsa;
 pub mod entry;
 pub mod event;
-pub mod ecdsa;
 pub mod hash;
 pub mod historian;
 pub mod ledger;