diff --git a/code/hub.go b/code/hub.go
index 5acf705..64897a9 100644
--- a/code/hub.go
+++ b/code/hub.go
@@ -25,9 +25,9 @@ func newError(content string) message {
 	}
 }
 
-func newMessage(sender string, content string) message {
+func newMessage(msgType string, sender string, content string) message {
 	return message{
-		Type:    "message",
+		Type:    msgType,
 		Sender:  sender,
 		Content: content,
 		Date:    time.Now().UTC(),
@@ -61,12 +61,12 @@ func sendUserList(who *websocket.Conn) {
 }
 
 func sendChatMessage(sender *websocket.Conn, msg string) {
-	m := newMessage(usernames[sender], msg)
+	m := newMessage("message", usernames[sender], msg)
 	m.dispatch()
 }
 
 func handleDisconnection(sender *websocket.Conn) {
-	m := newMessage("server", usernames[sender]+" has left the chat.")
+	m := newMessage("leave", "server", usernames[sender])
 	m.dispatch()
 	delete(usernames, sender)
 }
@@ -81,7 +81,7 @@ func handleIncomingMessage(sender *websocket.Conn, msg string) {
 		sendUserList(sender)
 
 		usernames[sender] = username
-		m := newMessage("server", username+" has joined the chat")
+		m := newMessage("join", "server", username)
 		m.dispatch()
 		return
 	}