diff --git a/client-ctl.go b/client-ctl.go
index 8265ead..07849cc 100644
--- a/client-ctl.go
+++ b/client-ctl.go
@@ -193,7 +193,7 @@ func (ctl *client_ctl) Cors(req *http.Request) bool {
 
 func (ctl *client_ctl) Authenticate(req *http.Request) (int, string) {
 	if ctl.c.ctl_auth == nil { return http.StatusOK, "" }
-     return ctl.c.ctl_auth.Authenticate(req)
+	return ctl.c.ctl_auth.Authenticate(req)
 }
 
 // ------------------------------------
@@ -1196,13 +1196,13 @@ func (ctl *client_ctl_ws) ServeWebsocket(ws *websocket.Conn) (int, error) {
 
 	wg.Add(1)
 	go func() {
-          var c chan *ClientEvent
+		var c chan *ClientEvent
 		var err error
 
-          defer wg.Done()
-          c = sbsc.C
+		defer wg.Done()
+		c = sbsc.C
 
-          for c != nil {
+		for c != nil {
 			var e *ClientEvent
 			var ok bool
 			var msg[] byte
@@ -1227,7 +1227,7 @@ func (ctl *client_ctl_ws) ServeWebsocket(ws *websocket.Conn) (int, error) {
 		}
 
 		ws.Close() // hack to break the recv loop. don't care about double closes
-     }()
+	}()
 
 ws_recv_loop:
 	for {
diff --git a/server-ctl.go b/server-ctl.go
index af700fa..bb95d20 100644
--- a/server-ctl.go
+++ b/server-ctl.go
@@ -76,7 +76,7 @@ type json_out_server_stats struct {
 	ServerPeers int64 `json:"server-peers"`
 
 	SshProxySessions int64 `json:"pxy-ssh-sessions"`
-    ServerPtySessions int64 `json:"server-pty-sessions"`
+	ServerPtySessions int64 `json:"server-pty-sessions"`
 	ServerRptySessions int64 `json:"server-rpty-sessions"`
 	ServerRpxSessions int64 `json:"server-rpx-sessions"`
 }
@@ -979,13 +979,13 @@ func (ctl *server_ctl_ws) ServeWebsocket(ws *websocket.Conn) (int, error) {
 
 	wg.Add(1)
 	go func() {
-          var c chan *ServerEvent
+		var c chan *ServerEvent
 		var err error
 
-          defer wg.Done()
-          c = sbsc.C
+		defer wg.Done()
+		c = sbsc.C
 
-          for c != nil {
+		for c != nil {
 			var e *ServerEvent
 			var ok bool
 			var msg[] byte
@@ -1010,7 +1010,7 @@ func (ctl *server_ctl_ws) ServeWebsocket(ws *websocket.Conn) (int, error) {
 		}
 
 		ws.Close() // hack to break the recv loop. don't care about double closes
-     }()
+	}()
 
 ws_recv_loop:
 	for {
diff --git a/server-pxy.go b/server-pxy.go
index fd653e1..bc2d544 100644
--- a/server-pxy.go
+++ b/server-pxy.go
@@ -493,8 +493,8 @@ func (pxy *server_pxy_xterm_file) ServeHTTP(w http.ResponseWriter, req *http.Req
 				route_id = PORT_ID_MARKER
 				_, err = s.FindServerRouteByIdStr(conn_id, route_id)
 				if err != nil && s.wpx_foreign_port_proxy_maker != nil {
-                         _, err = s.wpx_foreign_port_proxy_maker("ssh", conn_id)
-                    }
+					_, err = s.wpx_foreign_port_proxy_maker("ssh", conn_id)
+				}
 			} else  {
 				conn_id = req.PathValue("conn_id")
 				route_id = req.PathValue("route_id")