diff --git a/cmd/aws-service-operator/main.go b/cmd/aws-service-operator/main.go
index d80a77ed4..065b0d3b6 100644
--- a/cmd/aws-service-operator/main.go
+++ b/cmd/aws-service-operator/main.go
@@ -20,7 +20,8 @@ var (
 	rootCmd = &cobra.Command{
 		Use:   "aws-operator",
 		Short: "AWS Operator manages your AWS Infrastructure using CRDs and Operators",
-		Long:  `TODO WRITE THIS`,
+		Long: `AWS Operator manages your AWS Infrastructure using CRDs and Operators. 
+With a single manifest file you can now model both the application and the resource necessary to run it.`,
 		Run: func(c *cobra.Command, _ []string) {
 			c.Help()
 		},
diff --git a/code-generation/pkg/codegen/templates.go b/code-generation/pkg/codegen/templates.go
index f9da85fb2..f38510ad1 100644
--- a/code-generation/pkg/codegen/templates.go
+++ b/code-generation/pkg/codegen/templates.go
@@ -203,10 +203,10 @@ func AssetNames() []string {
 
 // _bindata is a table, holding each asset generator, mapped to its name.
 var _bindata = map[string]func() (*asset, error){
-	"cft.go.templ": cftGoTempl,
-	"controller.go.templ": controllerGoTempl,
+	"cft.go.templ":                cftGoTempl,
+	"controller.go.templ":         controllerGoTempl,
 	"template_functions.go.templ": template_functionsGoTempl,
-	"types.go.templ": typesGoTempl,
+	"types.go.templ":              typesGoTempl,
 }
 
 // AssetDir returns the file names below a certain
@@ -248,11 +248,12 @@ type bintree struct {
 	Func     func() (*asset, error)
 	Children map[string]*bintree
 }
+
 var _bintree = &bintree{nil, map[string]*bintree{
-	"cft.go.templ": &bintree{cftGoTempl, map[string]*bintree{}},
-	"controller.go.templ": &bintree{controllerGoTempl, map[string]*bintree{}},
+	"cft.go.templ":                &bintree{cftGoTempl, map[string]*bintree{}},
+	"controller.go.templ":         &bintree{controllerGoTempl, map[string]*bintree{}},
 	"template_functions.go.templ": &bintree{template_functionsGoTempl, map[string]*bintree{}},
-	"types.go.templ": &bintree{typesGoTempl, map[string]*bintree{}},
+	"types.go.templ":              &bintree{typesGoTempl, map[string]*bintree{}},
 }}
 
 // RestoreAsset restores an asset under the given directory
@@ -301,4 +302,3 @@ func _filePath(dir, name string) string {
 	cannonicalName := strings.Replace(name, "\\", "/", -1)
 	return filepath.Join(append([]string{dir}, strings.Split(cannonicalName, "/")...)...)
 }
-
diff --git a/pkg/config/types.go b/pkg/config/types.go
index 9982210f8..c9093c987 100644
--- a/pkg/config/types.go
+++ b/pkg/config/types.go
@@ -23,7 +23,7 @@ type Config struct {
 	ClusterName   string
 	Bucket        string
 	AccountID     string
-	Recorder	  record.EventRecorder
+	Recorder      record.EventRecorder
 }
 
 // LoggingConfig defines the attributes for the logger
diff --git a/pkg/server/server.go b/pkg/server/server.go
index b9c19900c..04edd3432 100644
--- a/pkg/server/server.go
+++ b/pkg/server/server.go
@@ -7,6 +7,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws/session"
 	"time"
 
+	awsscheme "github.com/awslabs/aws-service-operator/pkg/client/clientset/versioned/scheme"
 	awsclient "github.com/awslabs/aws-service-operator/pkg/client/clientset/versioned/typed/service-operator.aws/v1alpha1"
 	"github.com/awslabs/aws-service-operator/pkg/config"
 	"github.com/awslabs/aws-service-operator/pkg/operator/cloudformationtemplate"
@@ -20,12 +21,11 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
 	"k8s.io/client-go/kubernetes"
+	"k8s.io/client-go/kubernetes/scheme"
+	typedcorev1 "k8s.io/client-go/kubernetes/typed/core/v1"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/client-go/tools/record"
-	typedcorev1 "k8s.io/client-go/kubernetes/typed/core/v1"
-	"k8s.io/client-go/kubernetes/scheme"
-	awsscheme "github.com/awslabs/aws-service-operator/pkg/client/clientset/versioned/scheme"
 )
 
 const controllerName = "aws-service-operator"