diff --git a/web.go b/web.go
index cbcc8fb..a8e1dac 100644
--- a/web.go
+++ b/web.go
@@ -28,11 +28,7 @@ type Page struct {
 var external_ip = ""
 
 func makeWebserver(port int) WebServer {
-	webserver := WebServer{}
-
-	webserver.port = port
-	webserver.client_token = make(map[*gumble.User]string)
-	webserver.token_client = make(map[string]*gumble.User)
+	webserver := WebServer{port, make(map[*gumble.User]string), make(map[string]*gumble.User)}
 
 	http.HandleFunc("/", webserver.homepage)
 	http.HandleFunc("/add", webserver.add)