diff --git a/server.go b/server.go
index 11b55f9..5672a99 100644
--- a/server.go
+++ b/server.go
@@ -85,7 +85,7 @@ func (err *NoUpstreamError) Error() string {
 // schemes. If no configured upstream server matches, a *NoUpstreamError is
 // returned. An empty URL.Scheme means that the caller needs to perform
 // auto-discovery with URL.Host.
-func (s *Server) Upstream(schemes... string) (*url.URL, error) {
+func (s *Server) Upstream(schemes ...string) (*url.URL, error) {
 	var urls []*url.URL
 	for _, scheme := range append(schemes, "") {
 		u, ok := s.upstreams[scheme]
diff --git a/session.go b/session.go
index 743cbf7..44af8d1 100644
--- a/session.go
+++ b/session.go
@@ -5,9 +5,9 @@ import (
 	"encoding/base64"
 	"errors"
 	"fmt"
+	"net/http"
 	"sync"
 	"time"
-	"net/http"
 
 	imapclient "github.com/emersion/go-imap/client"
 	"github.com/emersion/go-sasl"
diff --git a/template.go b/template.go
index 97a356c..b229d34 100644
--- a/template.go
+++ b/template.go
@@ -94,7 +94,7 @@ func (r *renderer) Render(w io.Writer, name string, data interface{}, ectx echo.
 
 	var renderData RenderData
 	if data == nil {
-		renderData = &struct { BaseRenderData }{ *NewBaseRenderData(ctx) }
+		renderData = &struct{ BaseRenderData }{*NewBaseRenderData(ctx)}
 	} else {
 		var ok bool
 		renderData, ok = data.(RenderData)