diff --git a/cmd/fathom/main.go b/cmd/fathom/main.go
index da6625f..1e4a22d 100644
--- a/cmd/fathom/main.go
+++ b/cmd/fathom/main.go
@@ -37,40 +37,8 @@ func main() {
 	app.Before = before
 	app.After = after
 	app.Commands = []cli.Command{
-		{
-			Name:    "server",
-			Aliases: []string{"s"},
-			Usage:   "start the fathom web server",
-			Action:  server,
-			Flags: []cli.Flag{
-				cli.StringFlag{
-					EnvVar: "FATHOM_SERVER_ADDR",
-					Name:   "addr,port",
-					Usage:  "server address",
-					Value:  ":8080",
-				},
-				cli.BoolFlag{
-					EnvVar: "FATHOM_DEBUG",
-					Name:   "debug, d",
-				},
-			},
-		},
-		{
-			Name:    "register",
-			Aliases: []string{"r"},
-			Usage:   "register a new admin user",
-			Action:  register,
-			Flags: []cli.Flag{
-				cli.StringFlag{
-					Name:  "email, e",
-					Usage: "user email",
-				},
-				cli.StringFlag{
-					Name:  "password, p",
-					Usage: "user password",
-				},
-			},
-		},
+		serverCmd,
+		registerCmd,
 	}
 
 	if len(os.Args) < 2 || os.Args[1] != "--version" {
diff --git a/cmd/fathom/register.go b/cmd/fathom/register.go
index 97f4934..5218ad2 100644
--- a/cmd/fathom/register.go
+++ b/cmd/fathom/register.go
@@ -10,6 +10,23 @@ import (
 	"golang.org/x/crypto/bcrypt"
 )
 
+var registerCmd = cli.Command{
+	Name:    "register",
+	Aliases: []string{"r"},
+	Usage:   "register a new admin user",
+	Action:  register,
+	Flags: []cli.Flag{
+		cli.StringFlag{
+			Name:  "email, e",
+			Usage: "user email",
+		},
+		cli.StringFlag{
+			Name:  "password, p",
+			Usage: "user password",
+		},
+	},
+}
+
 func register(c *cli.Context) error {
 	email := c.String("email")
 	if email == "" {
diff --git a/cmd/fathom/server.go b/cmd/fathom/server.go
index 6babec8..239609b 100644
--- a/cmd/fathom/server.go
+++ b/cmd/fathom/server.go
@@ -11,6 +11,25 @@ import (
 	"github.com/usefathom/fathom/pkg/api"
 )
 
+var serverCmd = cli.Command{
+	Name:    "server",
+	Aliases: []string{"s"},
+	Usage:   "start the fathom web server",
+	Action:  server,
+	Flags: []cli.Flag{
+		cli.StringFlag{
+			EnvVar: "FATHOM_SERVER_ADDR",
+			Name:   "addr,port",
+			Usage:  "server address",
+			Value:  ":8080",
+		},
+		cli.BoolFlag{
+			EnvVar: "FATHOM_DEBUG",
+			Name:   "debug, d",
+		},
+	},
+}
+
 func server(c *cli.Context) error {
 	var h http.Handler
 	a := api.New(app.database, app.config.Secret)