diff --git a/irc/client_lookup_set.go b/irc/client_lookup_set.go
index dee9d421..2661c2ef 100644
--- a/irc/client_lookup_set.go
+++ b/irc/client_lookup_set.go
@@ -37,9 +37,8 @@ func ExpandUserHost(userhost string) (expanded string) {
 	return
 }
 
-func QuoteLike(userhost string) (like string) {
-	like = likeQuoter.Replace(userhost)
-	return
+func QuoteLike(userhost string) string {
+	return likeQuoter.Replace(userhost)
 }
 
 type ClientLookupSet struct {
diff --git a/irc/server.go b/irc/server.go
index 7b7bdca5..bc511617 100644
--- a/irc/server.go
+++ b/irc/server.go
@@ -329,7 +329,7 @@ func (m *NickCommand) HandleRegServer(s *Server) {
 }
 
 func (msg *RFC1459UserCommand) HandleRegServer(server *Server) {
-	msg.HandleRegServer2(server)
+	msg.setUserInfo(server)
 }
 
 func (msg *RFC2812UserCommand) HandleRegServer(server *Server) {
@@ -341,10 +341,10 @@ func (msg *RFC2812UserCommand) HandleRegServer(server *Server) {
 		}
 		client.RplUModeIs(client)
 	}
-	msg.HandleRegServer2(server)
+	msg.setUserInfo(server)
 }
 
-func (msg *UserCommand) HandleRegServer2(server *Server) {
+func (msg *UserCommand) setUserInfo(server *Server) {
 	client := msg.Client()
 	server.clients.Remove(client)
 	client.username, client.realname = msg.username, msg.realname
@@ -497,7 +497,7 @@ func (m *ModeCommand) HandleServer(s *Server) {
 		return
 	}
 
-	changes := make(ModeChanges, 0)
+	changes := make(ModeChanges, 0, len(m.changes))
 
 	for _, change := range m.changes {
 		switch change.mode {