diff --git a/.gitignore b/.gitignore
index f1c181ec..95cf6da5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 
 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out
+.DS_Store
diff --git a/.travis.yml b/.travis.yml
index ad4ba6e0..c804050c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,6 @@ addons:
 script:
 - set -e
 - make test
-- make verify-codegen
 - make build
 
 after_success:
diff --git a/Makefile b/Makefile
index b5d26540..77ea734f 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ TAG?=latest
 VERSION?=$(shell grep 'VERSION' pkg/version/version.go | awk '{ print $$4 }' | tr -d '"')
 VERSION_MINOR:=$(shell grep 'VERSION' pkg/version/version.go | awk '{ print $$4 }' | tr -d '"' | rev | cut -d'.' -f2- | rev)
 PATCH:=$(shell grep 'VERSION' pkg/version/version.go | awk '{ print $$4 }' | tr -d '"' | awk -F. '{print $$NF}')
-
+SOURCE_DIRS = cmd pkg/apis pkg/controller pkg/server pkg/logging pkg/version
 run:
 	go run cmd/steerer/* -kubeconfig=$$HOME/.kube/config -log-level=debug -metrics-server=https://prometheus.istio.weavedx.com
 
@@ -12,12 +12,18 @@ build:
 push:
 	docker push stefanprodan/steerer:$(TAG)
 
-test:
-	go test ./...
+fmt:
+	gofmt -l -s -w $(SOURCE_DIRS)
 
-verify-codegen:
+test-fmt:
+	gofmt -l -s $(SOURCE_DIRS) | grep ".*\.go"; if [ "$$?" = "0" ]; then exit 1; fi
+
+test-codegen:
 	./hack/verify-codegen.sh
 
+test: test-fmt test-codegen
+	go test ./...
+
 helm-package:
 	cd chart/ && helm package steerer/
 	mv chart/*.tgz docs/
@@ -50,4 +56,14 @@ dev-up: version-up
 	docker push stefanprodan/steerer:$(VERSION)
 	helm upgrade --install steerer ./chart/steerer --namespace=istio-system
 
+release:
+	git tag $(VERSION)
+	git push origin $(VERSION)
+
+release-set: fmt version-set helm-package
+	git add .
+	git commit -m "Release $(VERSION)"
+	git push origin master
+	git tag $(VERSION)
+	git push origin $(VERSION)
 
diff --git a/pkg/controller/deployment.go b/pkg/controller/deployment.go
index 3aa7322b..a05e29ae 100644
--- a/pkg/controller/deployment.go
+++ b/pkg/controller/deployment.go
@@ -161,7 +161,7 @@ func (c *Controller) checkRolloutStatus(r *rolloutv1.Rollout, canaryVersion stri
 		}
 		r, err = c.rolloutClient.AppsV1beta1().Rollouts(r.Namespace).Update(r)
 		if err != nil {
-			c.logger.Errorf( "Rollout %s.%s status update failed: %v", r.Name, r.Namespace, err)
+			c.logger.Errorf("Rollout %s.%s status update failed: %v", r.Name, r.Namespace, err)
 			return false
 		}
 		return true
@@ -179,7 +179,7 @@ func (c *Controller) checkRolloutStatus(r *rolloutv1.Rollout, canaryVersion stri
 		}
 		r, err = c.rolloutClient.AppsV1beta1().Rollouts(r.Namespace).Update(r)
 		if err != nil {
-			c.logger.Errorf( "Rollout %s.%s status update failed: %v", r.Name, r.Namespace, err)
+			c.logger.Errorf("Rollout %s.%s status update failed: %v", r.Name, r.Namespace, err)
 			return false
 		}
 		return true
@@ -193,7 +193,7 @@ func (c *Controller) updateRolloutStatus(r *rolloutv1.Rollout, status string) bo
 	r.Status.State = status
 	r, err = c.rolloutClient.AppsV1beta1().Rollouts(r.Namespace).Update(r)
 	if err != nil {
-		c.logger.Errorf( "Rollout %s.%s status update failed: %v", r.Name, r.Namespace, err)
+		c.logger.Errorf("Rollout %s.%s status update failed: %v", r.Name, r.Namespace, err)
 		return false
 	}
 	return true
@@ -204,7 +204,7 @@ func (c *Controller) updateRolloutFailedChecks(r *rolloutv1.Rollout, val int) bo
 	r.Status.FailedChecks = val
 	r, err = c.rolloutClient.AppsV1beta1().Rollouts(r.Namespace).Update(r)
 	if err != nil {
-		c.logger.Errorf( "Rollout %s.%s status update failed: %v", r.Name, r.Namespace, err)
+		c.logger.Errorf("Rollout %s.%s status update failed: %v", r.Name, r.Namespace, err)
 		return false
 	}
 	return true