diff --git a/cmd/pkgserver/api.go b/cmd/pkgserver/api.go
index 5c850dc..f90d4de 100644
--- a/cmd/pkgserver/api.go
+++ b/cmd/pkgserver/api.go
@@ -27,8 +27,8 @@ var (
 	infoPayloadOnce sync.Once
 )
 
-// serveInfo returns constant system information.
-func serveInfo(w http.ResponseWriter, _ *http.Request) {
+// handleInfo writes constant system information.
+func handleInfo(w http.ResponseWriter, _ *http.Request) {
 	infoPayloadOnce.Do(func() {
 		infoPayload.Count = int(rosa.PresetUnexportedStart)
 		infoPayload.HakureiVersion = info.Version()
@@ -37,86 +37,82 @@ func serveInfo(w http.ResponseWriter, _ *http.Request) {
 	writeAPIPayload(w, infoPayload)
 }
 
-func (index *packageIndex) serveStatus() http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		download := path.Dir(r.URL.Path) == "/status"
-		if index == nil {
-			http.Error(w, "index is nil", http.StatusInternalServerError)
-			return
-		}
-		name := path.Base(r.URL.Path)
-		p, ok := rosa.ResolveName(name)
-		if !ok {
-			http.NotFound(w, r)
-			return
-		}
-		m := rosa.GetMetadata(p)
-		pk, ok := index.names[m.Name]
-		if !ok {
-			http.NotFound(w, r)
-			return
-		}
-		if len(pk.status) > 0 {
-			if download {
-				w.Header().Set("Content-Type", "application/octet-stream")
-			} else {
-				w.Header().Set("Content-Type", "text/plain; charset=utf-8")
-			}
-			if download {
-				var version string
-				if pk.Version != "\u0000" {
-					version = pk.Version
-				} else {
-					version = "unknown"
-				}
-				w.Header().Set("Content-Disposition", fmt.Sprintf("attachment; filename=\"%s-%s-%s.log\"", pk.Name, version, pkg.Encode(pk.ident.Value())))
-			}
-
-			w.Header().Set("Cache-Control", "no-cache, no-store, must-revalidate")
-			_, err := io.Copy(w, bytes.NewReader(pk.status))
-			if err != nil {
-				http.Error(w, err.Error(), http.StatusInternalServerError)
-			}
+func (index *packageIndex) handleStatus(w http.ResponseWriter, r *http.Request) {
+	download := path.Dir(r.URL.Path) == "/status"
+	if index == nil {
+		http.Error(w, "index is nil", http.StatusInternalServerError)
+		return
+	}
+	name := path.Base(r.URL.Path)
+	p, ok := rosa.ResolveName(name)
+	if !ok {
+		http.NotFound(w, r)
+		return
+	}
+	m := rosa.GetMetadata(p)
+	pk, ok := index.names[m.Name]
+	if !ok {
+		http.NotFound(w, r)
+		return
+	}
+	if len(pk.status) > 0 {
+		if download {
+			w.Header().Set("Content-Type", "application/octet-stream")
 		} else {
-			http.NotFound(w, r)
+			w.Header().Set("Content-Type", "text/plain; charset=utf-8")
 		}
+		if download {
+			var version string
+			if pk.Version != "\u0000" {
+				version = pk.Version
+			} else {
+				version = "unknown"
+			}
+			w.Header().Set("Content-Disposition", fmt.Sprintf("attachment; filename=\"%s-%s-%s.log\"", pk.Name, version, pkg.Encode(pk.ident.Value())))
+		}
+
+		w.Header().Set("Cache-Control", "no-cache, no-store, must-revalidate")
+		_, err := io.Copy(w, bytes.NewReader(pk.status))
+		if err != nil {
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+		}
+	} else {
+		http.NotFound(w, r)
 	}
 }
 
-func (index *packageIndex) serveGet() http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		q := r.URL.Query()
-		limit, err := strconv.Atoi(q.Get("limit"))
-		if err != nil || limit > 100 || limit < 1 {
-			http.Error(w, fmt.Sprintf("limit must be an integer between 1 and 100"), http.StatusBadRequest)
-			return
-		}
-		i, err := strconv.Atoi(q.Get("index"))
-		if err != nil || i >= len(index.sorts[0]) || i < 0 {
-			http.Error(w, fmt.Sprintf("index must be an integer between 0 and %d", len(index.sorts[0])-1), http.StatusBadRequest)
-			return
-		}
-		sort, err := strconv.Atoi(q.Get("sort"))
-		if err != nil || sort >= len(index.sorts) || sort < 0 {
-			http.Error(w, fmt.Sprintf("sort must be an integer between 0 and %d", len(index.sorts)-1), http.StatusBadRequest)
-			return
-		}
-		values := index.sorts[sort][i:min(i+limit, len(index.sorts[sort]))]
-		// TODO(mae): remove count field
-		writeAPIPayload(w, &struct {
-			Count  int         `json:"count"`
-			Values []*metadata `json:"values"`
-		}{len(values), values})
+func (index *packageIndex) handleGet(w http.ResponseWriter, r *http.Request) {
+	q := r.URL.Query()
+	limit, err := strconv.Atoi(q.Get("limit"))
+	if err != nil || limit > 100 || limit < 1 {
+		http.Error(w, fmt.Sprintf("limit must be an integer between 1 and 100"), http.StatusBadRequest)
+		return
 	}
+	i, err := strconv.Atoi(q.Get("index"))
+	if err != nil || i >= len(index.sorts[0]) || i < 0 {
+		http.Error(w, fmt.Sprintf("index must be an integer between 0 and %d", len(index.sorts[0])-1), http.StatusBadRequest)
+		return
+	}
+	sort, err := strconv.Atoi(q.Get("sort"))
+	if err != nil || sort >= len(index.sorts) || sort < 0 {
+		http.Error(w, fmt.Sprintf("sort must be an integer between 0 and %d", len(index.sorts)-1), http.StatusBadRequest)
+		return
+	}
+	values := index.sorts[sort][i:min(i+limit, len(index.sorts[sort]))]
+	// TODO(mae): remove count field
+	writeAPIPayload(w, &struct {
+		Count  int         `json:"count"`
+		Values []*metadata `json:"values"`
+	}{len(values), values})
 }
 
 const ApiVersion = "v1"
 
 func apiRoutes(mux *http.ServeMux, index *packageIndex) {
-	mux.HandleFunc(fmt.Sprintf("GET /api/%s/info", ApiVersion), serveInfo)
-	mux.HandleFunc(fmt.Sprintf("GET /api/%s/get", ApiVersion), index.serveGet())
-	mux.HandleFunc(fmt.Sprintf("GET /api/%s/status/", ApiVersion), index.serveStatus())
-	mux.HandleFunc("GET /status/", index.serveStatus())
+	mux.HandleFunc(fmt.Sprintf("GET /api/%s/info", ApiVersion), handleInfo)
+	mux.HandleFunc(fmt.Sprintf("GET /api/%s/get", ApiVersion), index.handleGet)
+	mux.HandleFunc(fmt.Sprintf("GET /api/%s/status/", ApiVersion), index.handleStatus)
+	mux.HandleFunc("GET /status/", index.handleStatus)
 }
 
 // writeAPIPayload sets headers common to API responses and encodes payload as
diff --git a/cmd/pkgserver/api_test.go b/cmd/pkgserver/api_test.go
index 8728e17..26595d4 100644
--- a/cmd/pkgserver/api_test.go
+++ b/cmd/pkgserver/api_test.go
@@ -18,7 +18,7 @@ func TestAPIInfo(t *testing.T) {
 	t.Parallel()
 
 	w := httptest.NewRecorder()
-	serveInfo(w, httptest.NewRequestWithContext(
+	handleInfo(w, httptest.NewRequestWithContext(
 		t.Context(),
 		http.MethodGet,
 		prefix+"info",
@@ -42,7 +42,7 @@ func TestAPIGet(t *testing.T) {
 	index := newIndex(t)
 	newRequest := func(suffix string) *httptest.ResponseRecorder {
 		w := httptest.NewRecorder()
-		index.serveGet()(w, httptest.NewRequestWithContext(
+		index.handleGet(w, httptest.NewRequestWithContext(
 			t.Context(),
 			http.MethodGet,
 			target+suffix,