diff --git a/irc/client.go b/irc/client.go
index 83528fad..29addec0 100644
--- a/irc/client.go
+++ b/irc/client.go
@@ -118,9 +118,6 @@ func (client *Client) connectionClosed() {
 }
 
 func (client *Client) Destroy() {
-	if DEBUG_CLIENT {
-		log.Printf("%s: destroying", client)
-	}
 	// clean up self
 
 	client.socket.Close()
diff --git a/irc/server.go b/irc/server.go
index c4be8079..0e6fd11b 100644
--- a/irc/server.go
+++ b/irc/server.go
@@ -121,19 +121,23 @@ func newListener(config ListenerConfig) (net.Listener, error) {
 func (s *Server) listen(config ListenerConfig) {
 	listener, err := newListener(config)
 	if err != nil {
-		log.Fatal("Server.Listen: ", err)
+		log.Fatal(s, "listen error: ", err)
 	}
 
-	log.Print("Server.Listen: listening on ", config.Address)
+	if DEBUG_SERVER {
+		log.Printf("%s listening on %s", s, config.Address)
+	}
 
 	for {
 		conn, err := listener.Accept()
 		if err != nil {
-			log.Print("Server.Accept: ", err)
+			if DEBUG_SERVER {
+				log.Printf("%s accept error: %s", s, err)
+			}
 			continue
 		}
 		if DEBUG_SERVER {
-			log.Print("Server.Accept: ", conn.RemoteAddr())
+			log.Printf("%s accept: %s", s, conn.RemoteAddr())
 		}
 
 		s.conns <- conn
diff --git a/irc/socket.go b/irc/socket.go
index 5c2fa78a..965480f0 100644
--- a/irc/socket.go
+++ b/irc/socket.go
@@ -76,9 +76,6 @@ func (socket *Socket) readLines() {
 
 	close(socket.receive)
 	socket.Close()
-	if DEBUG_NET {
-		log.Printf("%s closed", socket)
-	}
 }
 
 func (socket *Socket) writeLines() {
@@ -105,13 +102,14 @@ func (socket *Socket) writeLines() {
 		}
 	}
 
-	if DEBUG_NET {
-		log.Printf("%s closing", socket)
-	}
 	if done {
 		socket.conn.Close()
 	}
 
+	if DEBUG_NET {
+		log.Printf("%s closed", socket)
+	}
+
 	// read incoming messages and discard to avoid hangs
 	for {
 		select {