diff --git a/src/conn.rs b/src/conn.rs
deleted file mode 100644
index 1b1665d..0000000
--- a/src/conn.rs
+++ /dev/null
@@ -1,116 +0,0 @@
-use crate::frame::{self, Frame};
-
-use bytes::{Buf, BytesMut};
-use std::io::{self, Cursor};
-use tokio::io::{AsyncReadExt, AsyncWriteExt, BufStream};
-use tokio::net::TcpStream;
-
-#[derive(Debug)]
-pub(crate) struct Connection {
-    stream: BufStream<TcpStream>,
-    buffer: BytesMut,
-}
-
-impl Connection {
-    pub(crate) fn new(socket: TcpStream) -> Connection {
-        Connection {
-            stream: BufStream::new(socket),
-            buffer: BytesMut::with_capacity(4 * 1024),
-        }
-    }
-
-    pub(crate) async fn read_frame(&mut self) -> crate::Result<Option<Frame>> {
-        use frame::Error::Incomplete;
-
-        loop {
-            let mut buf = Cursor::new(&self.buffer[..]);
-
-            match Frame::check(&mut buf) {
-                Ok(_) => {
-                    // Get the length of the message
-                    let len = buf.position() as usize;
-
-                    // Reset the position
-                    buf.set_position(0);
-
-                    let frame = Frame::parse(&mut buf)?;
-
-                    // Clear data from the buffer
-                    self.buffer.advance(len);
-
-                    return Ok(Some(frame));
-                }
-                Err(Incomplete) => {}
-                Err(e) => return Err(e.into()),
-            }
-
-            if 0 == self.stream.read_buf(&mut self.buffer).await? {
-                return Ok(None);
-            }
-        }
-    }
-
-    pub(crate) async fn write_frame(&mut self, frame: &Frame) -> io::Result<()> {
-        match frame {
-            Frame::Array(val) => {
-                self.stream.write_u8(b'*').await?;
-                self.write_decimal(val.len() as u64).await?;
-
-                for entry in &**val {
-                    self.write_value(entry).await?;
-                }
-            }
-            _ => self.write_value(frame).await?,
-        }
-
-        self.stream.flush().await
-    }
-
-    async fn write_value(&mut self, frame: &Frame) -> io::Result<()> {
-        match frame {
-            Frame::Simple(val) => {
-                self.stream.write_u8(b'+').await?;
-                self.stream.write_all(val.as_bytes()).await?;
-                self.stream.write_all(b"\r\n").await?;
-            }
-            Frame::Error(val) => {
-                self.stream.write_u8(b'-').await?;
-                self.stream.write_all(val.as_bytes()).await?;
-                self.stream.write_all(b"\r\n").await?;
-            }
-            Frame::Integer(val) => {
-                self.stream.write_u8(b':').await?;
-                self.write_decimal(*val).await?;
-            }
-            Frame::Null => {
-                self.stream.write_all(b"$-1\r\n").await?;
-            }
-            Frame::Bulk(val) => {
-                let len = val.len();
-
-                self.stream.write_u8(b'$').await?;
-                self.write_decimal(len as u64).await?;
-                self.stream.write_all(val).await?;
-                self.stream.write_all(b"\r\n").await?;
-            }
-            Frame::Array(_val) => unreachable!(),
-        }
-
-        Ok(())
-    }
-
-    async fn write_decimal(&mut self, val: u64) -> io::Result<()> {
-        use std::io::Write;
-
-        // Convert the value to a string
-        let mut buf = [0u8; 12];
-        let mut buf = Cursor::new(&mut buf[..]);
-        write!(&mut buf, "{}", val)?;
-
-        let pos = buf.position() as usize;
-        self.stream.write_all(&buf.get_ref()[..pos]).await?;
-        self.stream.write_all(b"\r\n").await?;
-
-        Ok(())
-    }
-}
diff --git a/src/connection.rs b/src/connection.rs
new file mode 100644
index 0000000..d010466
--- /dev/null
+++ b/src/connection.rs
@@ -0,0 +1,229 @@
+use crate::frame::{self, Frame};
+
+use bytes::{Buf, BytesMut};
+use std::io::{self, Cursor};
+use tokio::io::{AsyncReadExt, AsyncWriteExt, BufWriter};
+use tokio::net::TcpStream;
+
+/// Send and receive `Frame` values from a remote peer.
+///
+/// When implementing networking protocols, a message on that protocol is
+/// often composed of several smaller messages known as frames. The purpose of
+/// `Connection` is to read and write frames on the underlying `TcpStream`.
+///
+/// To read frames, the `Connection` uses an internal buffer, which is filled
+/// up until there are enough bytes to create a full frame. Once this happens,
+/// the `Connection` creates the frame and returns it to the caller.
+///
+/// When sending frames, the frame is first encoded into the write buffer.
+/// The contents of the write buffer are then written to the socket.
+#[derive(Debug)]
+pub(crate) struct Connection {
+    // The `TcpStream`. It is decorated with a `BufWriter`, which provides write
+    // level buffering. The `BufWriter` implementation provided by Tokio is
+    // sufficient for our needs.
+    stream: BufWriter<TcpStream>,
+
+    // The buffer for reading frames. Unfortunately, Tokio's `BufReader`
+    // currently requires you to empty its buffer before you can ask it to
+    // retrieve more data from the underlying stream, so we have to manually
+    // implement buffering. This should be fixed in Tokio v0.3.
+    buffer: BytesMut,
+}
+
+impl Connection {
+    /// Create a new `Connection`, backed by `socket`. Read and write buffers
+    /// are initialized.
+    pub(crate) fn new(socket: TcpStream) -> Connection {
+        Connection {
+            stream: BufWriter::new(socket),
+            // Default to a 4KB read buffer. For the use case of mini redis,
+            // this is fine. However, real applications will want to tune this
+            // value to their specific use case. There is a high likelihood that
+            // a larger read buffer will work better.
+            buffer: BytesMut::with_capacity(4 * 1024),
+        }
+    }
+
+    /// Read a single `Frame` value from the underlying stream.
+    ///
+    /// The function waits until it has retrieved enough data to parse a frame.
+    /// Any data remaining in the read buffer after the frame has been parsed is
+    /// kept there for the next call to `read_frame`.
+    ///
+    /// # Returns
+    ///
+    /// On success, the received frame is returned. If the `TcpStream`
+    /// is closed in a way that doesn't break a frame in half, it retuns 
+    /// `None`. Otherwise, an error is returned.
+    pub(crate) async fn read_frame(&mut self) -> crate::Result<Option<Frame>> {
+        use frame::Error::Incomplete;
+
+        loop {
+            // Cursor is used to track the "current" location in the
+            // buffer. Cursor also implements `Buf` from the `bytes` crate
+            // which provides a number of helpful utilities for working
+            // with bytes.
+            let mut buf = Cursor::new(&self.buffer[..]);
+
+            // The first step is to check if enough data has been buffered to
+            // parse a single frame. This step is usually much faster than doing
+            // a full parse of the frame, and allows us to skip allocating data
+            // structures to hold the frame data unless we know the full frame
+            // has been received.
+            match Frame::check(&mut buf) {
+                Ok(_) => {
+                    // The `check` function will have advanced the cursor until
+                    // the end of the frame. Since the cursor had position set
+                    // to zero before `Frame::check` was called, we obtain the
+                    // length of the frame by checking the cursor position.
+                    let len = buf.position() as usize;
+
+                    // Reset the position to zero before passing the cursor to
+                    // `Frame::parse`.
+                    buf.set_position(0);
+
+                    // Parse the frame from the buffer. This allocates the
+                    // necessary structures to represent the frame and returns
+                    // the frame value.
+                    //
+                    // If the encoded frame representation is invalid, an error
+                    // is returned. This should terminate the **current**
+                    // connection but should not impact any other connected
+                    // client.
+                    let frame = Frame::parse(&mut buf)?;
+
+                    // Discard the parsed data from the read buffer.
+                    //
+                    // When `advance` is called on the read buffer, all of the
+                    // data up to `len` is discarded. The details of how this
+                    // works is left to `BytesMut`. This is often done by moving
+                    // an internal cursor, but it may be done by reallocataing
+                    // and copying data.
+                    self.buffer.advance(len);
+
+                    // Return the parsed frame to the caller.
+                    return Ok(Some(frame));
+                }
+                // There is not enough data present in the read buffer to parse
+                // a single frame. We must wait for more data to be received
+                // from the socket. Reading from the socket will be done in the
+                // statement after this `match`.
+                //
+                // We do not want to return `Err` from here as this "error" is
+                // an expected runtime condition.
+                Err(Incomplete) => {}
+                // An error was encountered while parsing the frame. The
+                // connection is now in an invalid state. Returning `Err` from
+                // here will result in the connection being closed.
+                Err(e) => return Err(e.into()),
+            }
+
+            // There is not enough buffered data to read a frame. Attempt to
+            // read more data from the socket.
+            //
+            // On success, the number of bytes is returned. `0` indicates "end
+            // of stream".
+            if 0 == self.stream.read_buf(&mut self.buffer).await? {
+                // The remote closed the connection. For this to be a clean
+                // shutdown, there should be no data in the read buffer. If
+                // there is, this means that the peer closed the socket while
+                // sending a frame.
+                if self.buffer.is_empty() {
+                    return Ok(None);
+                } else {
+                    return Err("connection reset by peer".into());
+                }
+            }
+        }
+    }
+
+    /// Write a single `Frame` value to the underlying stream.
+    ///
+    /// The `Frame` value is written to the socket using the various `write_*`
+    /// functions provided by `AsyncWrite`. Calling these functions directly on
+    /// a `TcpStream` is **not** advised, as this will result in a large number of
+    /// syscalls. However, it is fine to call these functions on a *buffered*
+    /// write stream. The data will be written to the buffer. Once the buffer is
+    /// full, it is flushed to the underlying socket.
+    pub(crate) async fn write_frame(&mut self, frame: &Frame) -> io::Result<()> {
+        // Arrays are encoded by encoding each entry. All other frame types are
+        // considered literals. For now, mini-redis is not able to encode
+        // recursive frame structures. See below for more details.
+        match frame {
+            Frame::Array(val) => {
+                // Encode the frame type prefix. For an array, it is `*`.
+                self.stream.write_u8(b'*').await?;
+
+                // Encode the length of the array.
+                self.write_decimal(val.len() as u64).await?;
+
+                // Iterate and encode each entry in the array.
+                for entry in &**val {
+                    self.write_value(entry).await?;
+                }
+            }
+            // The frame type is a literal. Encode the value directly.
+            _ => self.write_value(frame).await?,
+        }
+
+        // Ensure the encoded frame is written to the socket. The calls above
+        // are to the buffered stream and writes. Calling `flush` writes the
+        // remaining contents of the buffer to the socket.
+        self.stream.flush().await
+    }
+
+    /// Write a frame literal to the stream
+    async fn write_value(&mut self, frame: &Frame) -> io::Result<()> {
+        match frame {
+            Frame::Simple(val) => {
+                self.stream.write_u8(b'+').await?;
+                self.stream.write_all(val.as_bytes()).await?;
+                self.stream.write_all(b"\r\n").await?;
+            }
+            Frame::Error(val) => {
+                self.stream.write_u8(b'-').await?;
+                self.stream.write_all(val.as_bytes()).await?;
+                self.stream.write_all(b"\r\n").await?;
+            }
+            Frame::Integer(val) => {
+                self.stream.write_u8(b':').await?;
+                self.write_decimal(*val).await?;
+            }
+            Frame::Null => {
+                self.stream.write_all(b"$-1\r\n").await?;
+            }
+            Frame::Bulk(val) => {
+                let len = val.len();
+
+                self.stream.write_u8(b'$').await?;
+                self.write_decimal(len as u64).await?;
+                self.stream.write_all(val).await?;
+                self.stream.write_all(b"\r\n").await?;
+            }
+            // Encoding an `Array` from within a value cannot be done using a
+            // recursive strategy. In general, async fns do not support
+            // recursion. Mini-redis has not needed to encode nested arrays yet,
+            // so for now it is skipped.
+            Frame::Array(_val) => unreachable!(),
+        }
+
+        Ok(())
+    }
+
+    /// Write a decimal frame to the stream
+    async fn write_decimal(&mut self, val: u64) -> io::Result<()> {
+        use std::io::Write;
+
+        // Convert the value to a string
+        let mut buf = [0u8; 12];
+        let mut buf = Cursor::new(&mut buf[..]);
+        write!(&mut buf, "{}", val)?;
+
+        let pos = buf.position() as usize;
+        self.stream.write_all(&buf.get_ref()[..pos]).await?;
+        self.stream.write_all(b"\r\n").await?;
+
+        Ok(())
+    }
+}
diff --git a/src/lib.rs b/src/lib.rs
index 83de51c..32596ff 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -30,8 +30,8 @@ pub mod client;
 pub mod cmd;
 use cmd::Command;
 
-mod conn;
-use conn::Connection;
+mod connection;
+use connection::Connection;
 
 mod frame;
 use frame::Frame;
diff --git a/tests/server.rs b/tests/server.rs
index 70182da..0536ed6 100644
--- a/tests/server.rs
+++ b/tests/server.rs
@@ -1,6 +1,6 @@
 use mini_redis::server;
 
-use std::net::SocketAddr;
+use std::net::{SocketAddr, Shutdown};
 use tokio::io::{AsyncReadExt, AsyncWriteExt};
 use tokio::net::{TcpListener, TcpStream};
 use tokio::time::{self, Duration};
@@ -35,10 +35,16 @@ async fn key_value_get_set() {
     // Get the key, data is present
     stream.write_all(b"*2\r\n$3\r\nGET\r\n$5\r\nhello\r\n").await.unwrap();
 
+    // Shutdown the write half
+    stream.shutdown(Shutdown::Write).unwrap();
+
     // Read "world" response
     let mut response = [0; 11];
     stream.read_exact(&mut response).await.unwrap();
     assert_eq!(b"$5\r\nworld\r\n", &response);
+
+    // Receive `None`
+    assert_eq!(0, stream.read(&mut response).await.unwrap());
 }
 
 /// Similar to the basic key-value test, however, this time timeouts will be