diff --git a/main.go b/main.go
index 27a94d0..629fd3c 100644
--- a/main.go
+++ b/main.go
@@ -172,7 +172,7 @@ var dj = mumbledj{
 	cache:         NewSongCache(),
 }
 
-var web *WebServer
+var web WebServer
 
 // main primarily performs startup tasks. Grabs and parses commandline
 // args, sets up the gumble client and its listeners, and then connects to the server.
diff --git a/web.go b/web.go
index 37a897c..cbcc8fb 100644
--- a/web.go
+++ b/web.go
@@ -27,8 +27,8 @@ type Page struct {
 
 var external_ip = ""
 
-func Webserver(port int) *WebServer {
-	webserver := &WebServer{}
+func makeWebserver(port int) WebServer {
+	webserver := WebServer{}
 
 	webserver.port = port
 	webserver.client_token = make(map[*gumble.User]string)