diff --git a/application/application.go b/application/application.go
index 051ae46..bdc8993 100644
--- a/application/application.go
+++ b/application/application.go
@@ -27,6 +27,7 @@ func (ra *RicochetApplication) Init(pk *rsa.PrivateKey, af ApplicationInstanceFa
 	ra.contactManager = cm
 }
 
+// TODO: Reimplement OnJoin, OnLeave Events.
 func (ra *RicochetApplication) handleConnection(conn net.Conn) {
 	rc, err := goricochet.NegotiateVersionInbound(conn)
 	if err != nil {
@@ -60,9 +61,7 @@ func (ra *RicochetApplication) Broadcast(do func(rai *ApplicationInstance)) {
 }
 
 func (ra *RicochetApplication) Shutdown() {
-	log.Printf("Closing")
 	ra.l.Close()
-	log.Printf("Closed")
 }
 
 func (ra *RicochetApplication) Run(l net.Listener) {
@@ -76,7 +75,6 @@ func (ra *RicochetApplication) Run(l net.Listener) {
 		if err == nil {
 			go ra.handleConnection(conn)
 		} else {
-			log.Printf("Closing")
 			return
 		}
 	}
diff --git a/application/application_factory.go b/application/application_factory.go
index 8779458..c29aa77 100644
--- a/application/application_factory.go
+++ b/application/application_factory.go
@@ -5,29 +5,29 @@ import (
 	"github.com/s-rah/go-ricochet/connection"
 )
 
-// A concrete instance of a ricochet application, encapsulating a connection
+// ApplicationInstance is a  concrete instance of a ricochet application, encapsulating a connection
 type ApplicationInstance struct {
 	connection.AutoConnectionHandler
 	Connection     *connection.Connection
 	RemoteHostname string
 }
 
-// Application instance factory
+// ApplicationInstanceFactory
 type ApplicationInstanceFactory struct {
 	handlerMap map[string]func(*ApplicationInstance) func() channels.Handler
 }
 
-// Init setsup an Application Factory
+// Init sets up an Application Factory
 func (af *ApplicationInstanceFactory) Init() {
 	af.handlerMap = make(map[string]func(*ApplicationInstance) func() channels.Handler)
 }
 
-// AddHandler
+// AddHandler defines a channel type -> handler construct function
 func (af *ApplicationInstanceFactory) AddHandler(ctype string, chandler func(*ApplicationInstance) func() channels.Handler) {
 	af.handlerMap[ctype] = chandler
 }
 
-// GetApplicationInstance,
+// GetApplicationInstance buulds a new application instance using a connection as a base.
 func (af *ApplicationInstanceFactory) GetApplicationInstance(rc *connection.Connection) *ApplicationInstance {
 	rai := new(ApplicationInstance)
 	rai.Init()
@@ -38,3 +38,4 @@ func (af *ApplicationInstanceFactory) GetApplicationInstance(rc *connection.Conn
 	}
 	return rai
 }
+