diff --git a/src/lib.rs b/src/lib.rs
index af9786b..646cdc3 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -35,7 +35,7 @@ pub mod server;
 mod util;
 
 pub use error::{ConnectionError, Reason};
-pub use frame::{StreamId};
+pub use frame::StreamId;
 pub use proto::Connection;
 
 use bytes::Bytes;
diff --git a/src/proto/framed_read.rs b/src/proto/framed_read.rs
index cb97c91..d9bdc0f 100644
--- a/src/proto/framed_read.rs
+++ b/src/proto/framed_read.rs
@@ -7,7 +7,7 @@ use futures::*;
 
 use bytes::Bytes;
 
-use tokio_io::{AsyncRead};
+use tokio_io::AsyncRead;
 use tokio_io::codec::length_delimited;
 
 use std::io::{self, Cursor};
diff --git a/src/proto/mod.rs b/src/proto/mod.rs
index 025a822..e3ed3e9 100644
--- a/src/proto/mod.rs
+++ b/src/proto/mod.rs
@@ -7,18 +7,6 @@ use futures::*;
 use tokio_io::{AsyncRead, AsyncWrite};
 use tokio_io::codec::length_delimited;
 
-// First, pull in the internal interfaces that support macros used throughout this module.
-
-#[macro_use]
-mod apply_settings;
-#[macro_use]
-mod control_flow;
-#[macro_use]
-mod control_ping;
-mod control_settings;
-#[macro_use]
-mod control_streams;
-
 macro_rules! proxy_stream {
     ($struct:ident $(, $targs:ident)*) => (
         impl<T: Stream$(, $targs)*> Stream for $struct<T$(, $targs)*> {
@@ -61,6 +49,18 @@ macro_rules! proxy_ready_sink {
     )
 }
 
+// First, pull in the internal interfaces that support macros used throughout this module.
+
+#[macro_use]
+mod apply_settings;
+#[macro_use]
+mod control_flow;
+#[macro_use]
+mod control_ping;
+mod control_settings;
+#[macro_use]
+mod control_streams;
+
 use self::apply_settings::ApplySettings;
 use self::control_flow::ControlFlow;
 use self::control_ping::ControlPing;
@@ -84,11 +84,11 @@ mod stream_states;
 
 pub use self::connection::Connection;
 
-use self::flow_control::{FlowControl};
-use self::flow_control_state::{FlowControlState};
+use self::flow_control::FlowControl;
+use self::flow_control_state::FlowControlState;
 use self::framed_read::FramedRead;
 use self::framed_write::FramedWrite;
-use self::ping_pong::{PingPong};
+use self::ping_pong::PingPong;
 use self::ready::ReadySink;
 use self::settings::Settings;
 use self::stream_recv_close::StreamRecvClose;
diff --git a/src/proto/stream_recv_close.rs b/src/proto/stream_recv_close.rs
index 9a8c586..1868ea6 100644
--- a/src/proto/stream_recv_close.rs
+++ b/src/proto/stream_recv_close.rs
@@ -1,4 +1,4 @@
-use {ConnectionError};
+use ConnectionError;
 use error::Reason;
 use frame::{self, Frame};
 use proto::*;