diff --git a/core/src/api.rs b/core/src/api.rs
index b0484540..743a03de 100644
--- a/core/src/api.rs
+++ b/core/src/api.rs
@@ -1,9 +1,9 @@
+use events::Key;
 use hex;
 use std::collections::HashMap;
 use std::error::Error;
 use std::fmt;
 use util::maybe_utf8;
-use events::Key;
 
 #[derive(PartialEq)]
 pub enum APIEvent {
diff --git a/core/src/receive.rs b/core/src/receive.rs
index 0aa22047..b8291754 100644
--- a/core/src/receive.rs
+++ b/core/src/receive.rs
@@ -1,4 +1,4 @@
-use events::{Key, Events};
+use events::{Events, Key};
 use key;
 use std::str;
 // we process these
diff --git a/core/src/send.rs b/core/src/send.rs
index 63205712..05e911b6 100644
--- a/core/src/send.rs
+++ b/core/src/send.rs
@@ -1,4 +1,4 @@
-use events::{Key, Events};
+use events::{Events, Key};
 use key;
 // we process these
 use events::SendEvent;
@@ -68,12 +68,7 @@ impl SendMachine {
         es
     }
 
-    fn deliver(
-        &self,
-        key: Key,
-        phase: String,
-        plaintext: Vec<u8>,
-    ) -> Events {
+    fn deliver(&self, key: Key, phase: String, plaintext: Vec<u8>) -> Events {
         let data_key = key::derive_phase_key(&self.side, &key, &phase);
         let (_nonce, encrypted) = key::encrypt_data(data_key, &plaintext);
         events![M_AddMessage(phase, encrypted)]