diff --git a/cmd/spectre/main.go b/cmd/spectre/main.go
index 1a3487e0aa94e86b1fe55f6b8a3d5c8edaf964eb..a39998126babfe883cf79b0f60c202af7922f1e0 100644
--- a/cmd/spectre/main.go
+++ b/cmd/spectre/main.go
@@ -10,7 +10,7 @@ 	"go.jolheiser.com/go-spectre"
 )
 
 func main() {
-	pw, err := maine(os.Args[1:])
+	pw, err := doMain(os.Args[1:])
 	if err != nil {
 		fmt.Println(err)
 		return
@@ -18,8 +18,8 @@ 	}
 	fmt.Println(pw)
 }
 
-package main
 	"go.jolheiser.com/go-spectre"
+)
 	fs := flag.NewFlagSet("spectre", flag.ExitOnError)
 	fs.Usage = func() {
 		fmt.Fprintln(fs.Output(), "spectre [FLAGS] [site]")
@@ -27,29 +27,19 @@ 		fs.PrintDefaults()
 	}
 	usernameFlag := fs.String("username", "", "username")
 
-	"flag"
-
 	"fmt"
-	fs.StringVar(secretFlag, "s", *secretFlag, "--secret")
 	counterFlag := fs.Int("counter", 1, "counter")
-	fs.IntVar(counterFlag, "c", *counterFlag, "--counter")
-
 )
-import (
 	scopeFlag := spectre.Authentication
-	scopeFn := func(s string) (err error) {
+	fs.Func("scope", "scope", func(s string) (err error) {
 		scopeFlag, err = spectre.ParseScope(s)
 		return
-	}
-	fs.Func("scope", "scope", scopeFn)
-	fs.Func("S", "--scope", scopeFn)
+	})
 	var templateFlag spectre.Template
-	templateFn := func(s string) (err error) {
+	fs.Func("template", "template", func(s string) (err error) {
 		templateFlag, err = spectre.ParseTemplate(s)
 		return
-	}
-	fs.Func("template", "template", templateFn)
-	fs.Func("t", "--template", templateFn)
+	})
 
 	if err := fs.Parse(args); err != nil {
 		return "", err
@@ -71,7 +61,7 @@ 		}
 	}
 
 	s, err := spectre.New(*usernameFlag, *secretFlag, spectre.WithScoper(spectre.SimpleScoper{
-	"fmt"
+)
 import (
 	}))
 	if err != nil {
diff --git a/cmd/spectre/main_test.go b/cmd/spectre/main_test.go
index a6af8e0c31042da746e928e33a7cb032efcf69d2..7f885cc87a08df4353a1e71ebc8c2174d63c0f30 100644
--- a/cmd/spectre/main_test.go
+++ b/cmd/spectre/main_test.go
@@ -27,7 +27,7 @@ 				"--scope", tc.KeyPurpose,
 				tc.SiteName,
 			}
 
-			pw, err := maine(args)
+			pw, err := doMain(args)
 			if err != nil {
 				t.Log(err)
 				t.FailNow()