@@ -2,6 +2,9 @@
 require 'goliath/env'
 
 module Goliath
+  # The Goliath::Connection class handles sending and receiving data
+  # from the client.
+  #
   # @private
   class Connection < EM::Connection
     include Constants
@@ -80,6 +83,5 @@ def remote_address
     rescue Exception
       nil
     end
-
   end
 end
@@ -1,4 +1,5 @@
 module Goliath
+  # Constants used by the system to access data.
   module Constants
     INITIAL_BODY = ''
     # Force external_encoding of request's body to ASCII_8BIT
@@ -44,7 +45,5 @@ module Constants
     CONNECTION      = 'CONNECTION'
 
     GOLIATH_ENV     = 'goliath.env'
-
-    HOST_PORT_REGEXP = /(?<host>.*?):(?<port>.*)/
   end
 end
@@ -1,4 +1,7 @@
 module Goliath
+  # Goliath::Request is responsible for processing a request and returning
+  # the result back to the client.
+  #
   # @private
   class Request
     include EM::Deferrable
@@ -31,6 +34,9 @@ def initialize(app, conn, env)
     # Invoked by connection when header parsing is complete.
     # This method is invoked only once per request.
     #
+    # @param h [Hash] Request headers
+    # @param parser [Http::Parser] The parsed used to parse the request
+    # @return [Nil]
     def parse_header(h, parser)
       h.each do |k, v|
         @env[HTTP_PREFIX + k.gsub('-','_').upcase] = v
@@ -50,23 +56,29 @@ def parse_header(h, parser)
     # Invoked by connection when new body data is
     # parsed from the existing TCP stream.
     #
-    # Note: in theory, we can make this stream the
+    # @note In theory, we can make this stream the
     # data into the processing step for async
     # uploads, etc. This would also require additional
     # callbacks for headers, etc.. Maybe something to
     # explore later.
     #
+    # @param data [String] The received data
+    # @return [Nil]
     def parse(data)
       @body << data
     end
 
+    # Called to determine if the request has received all data from the client
+    #
+    # @return [Boolean] True if all data is received, false otherwise
     def finished?
       @state == :finished
     end
 
     # Invoked by connection when upstream client
     # terminates the current TCP session.
     #
+    # @return [Nil]
     def close
       @response.close rescue nil
       @env[ASYNC_CLOSE].succeed if @env[ASYNC_CLOSE]
@@ -78,6 +90,7 @@ def close
     # an immediate response is served, or an async
     # response is indicated.
     #
+    # @return [Nil]
     def process
       begin
         @state = :finished
@@ -105,6 +118,8 @@ def process
     # so the actual time to serve both requests in scenario
     # above, should be ~1s + data transfer time.
     #
+    # @param results [Array] The status, headers and body to return to the client
+    # @return [Nil]
     def post_process(results)
       begin
         status, headers, body = results
@@ -131,24 +146,30 @@ def post_process(results)
 
     private
 
-      def server_exception(e)
-        @env[LOGGER].error("#{e.message}\n#{e.backtrace.join("\n")}")
-        post_process([500, {}, 'An error happened'])
-      end
+    # Handles logging server exceptions
+    #
+    # @param e [Exception] The exception to log
+    # @return [Nil]
+    def server_exception(e)
+      @env[LOGGER].error("#{e.message}\n#{e.backtrace.join("\n")}")
+      post_process([500, {}, 'An error happened'])
+    end
 
-      def keep_alive
-        case @env[HTTP_VERSION]
-          # HTTP 1.1: all requests are persistent requests, client
-          # must send a Connection:close header to indicate otherwise
-          when '1.1' then
-            (@env[HTTP_PREFIX + CONNECTION].downcase != 'close') rescue true
-
-            # HTTP 1.0: all requests are non keep-alive, client must
-            # send a Connection: Keep-Alive to indicate otherwise
-          when '1.0' then
-            (@env[HTTP_PREFIX + CONNECTION].downcase == 'keep-alive') rescue false
-        end
+    # Used to determine if the connection should  be kept open
+    #
+    # @return [Boolean] True to keep the connection open, false otherwise
+    def keep_alive
+      case @env[HTTP_VERSION]
+        # HTTP 1.1: all requests are persistent requests, client
+        # must send a Connection:close header to indicate otherwise
+        when '1.1' then
+          (@env[HTTP_PREFIX + CONNECTION].downcase != 'close') rescue true
+
+          # HTTP 1.0: all requests are non keep-alive, client must
+          # send a Connection: Keep-Alive to indicate otherwise
+        when '1.0' then
+          (@env[HTTP_PREFIX + CONNECTION].downcase == 'keep-alive') rescue false
       end
-
+    end
   end
 end
@@ -4,31 +4,52 @@
 require 'time'
 
 module Goliath
+  # Goliath::Response holds the information that will be sent back
+  # to the client.
+  #
   # @private
   class Response
-    attr_accessor :status, :headers, :body
+    # The status code to send
+    attr_accessor :status
 
-    SERVER     = 'Server'.freeze
-    DATE       = 'Date'.freeze
+    # The headers to send
+    attr_accessor :headers
 
-    STREAMING  = :goliath_stream_response
+    # The body to send
+    attr_accessor :body
+
+    SERVER = 'Server'.freeze
+    DATE = 'Date'.freeze
+
+    # Used to signal that a response is a streaming response
+    STREAMING = :goliath_stream_response
 
     def initialize
       @headers = Goliath::Headers.new
       @status = 200
     end
 
+    # Creates the header line for the response
+    #
+    # @return [String] The HTTP header line
     def head
       "HTTP/1.1 #{status} #{HTTP_STATUS_CODES[status.to_i]}\r\n"
     end
 
+    # Creats the headers to be returned to the client
+    #
+    # @return [String] The HTTP headers
     def headers_output
       headers[SERVER] = Goliath::Request::SERVER
       headers[DATE] = Time.now.httpdate
 
       "#{headers.to_s}\r\n"
     end
 
+    # Sets a set of key value pairs into the headers
+    #
+    # @param key_value_pairs [Hash] The key/value pairs to set as headers
+    # @return [Nil]
     def headers=(key_value_pairs)
       return unless key_value_pairs
 
@@ -47,10 +68,17 @@ def headers=(key_value_pairs)
       end
     end
 
+    # Used to signal that the response is closed
+    #
+    # @return [Nil]
     def close
       body.close if body.respond_to?(:close)
     end
 
+    # Yields each portion of the response
+    #
+    # @yields [String] The header line, headers and body content
+    # @return [Nil]
     def each
       yield head
       yield headers_output
 
@@ -1,3 +1,4 @@
 module Goliath
+  # The current version of Goliath
   VERSION = '0.9.0'
 end