diff --git a/pkg/apiserver/apiserver.go b/pkg/apiserver/apiserver.go
index 4621cca40..f3060b958 100644
--- a/pkg/apiserver/apiserver.go
+++ b/pkg/apiserver/apiserver.go
@@ -5,11 +5,11 @@ import (
 	"fmt"
 	"net/http"
 	"net/http/pprof"
-	"sync"
 	"regexp"
+	"sync"
 
-	"github.com/Sirupsen/logrus"
 	"encoding/json"
+	"github.com/Sirupsen/logrus"
 )
 
 type ClusterInformer interface {
diff --git a/pkg/cluster/cluster.go b/pkg/cluster/cluster.go
index 2f34000d8..921284ede 100644
--- a/pkg/cluster/cluster.go
+++ b/pkg/cluster/cluster.go
@@ -36,7 +36,7 @@ var (
 // Config contains operator-wide clients and configuration used from a cluster. TODO: remove struct duplication.
 type Config struct {
 	OpConfig            config.Config
-	RestConfig          *rest.Config `json:"-"`
+	RestConfig          *rest.Config           `json:"-"`
 	InfrastructureRoles map[string]spec.PgUser // inherited from the controller
 }
 
diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go
index 1b9ccad1b..4a7e938c3 100644
--- a/pkg/controller/controller.go
+++ b/pkg/controller/controller.go
@@ -10,12 +10,12 @@ import (
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/cache"
 
+	"github.com/zalando-incubator/postgres-operator/pkg/apiserver"
 	"github.com/zalando-incubator/postgres-operator/pkg/cluster"
 	"github.com/zalando-incubator/postgres-operator/pkg/spec"
 	"github.com/zalando-incubator/postgres-operator/pkg/util/config"
 	"github.com/zalando-incubator/postgres-operator/pkg/util/constants"
 	"github.com/zalando-incubator/postgres-operator/pkg/util/k8sutil"
-	"github.com/zalando-incubator/postgres-operator/pkg/apiserver"
 )
 
 type Config struct {
diff --git a/pkg/controller/status.go b/pkg/controller/status.go
index 898c06c3d..b4297a57a 100644
--- a/pkg/controller/status.go
+++ b/pkg/controller/status.go
@@ -42,7 +42,7 @@ func (c *Controller) ClusterStatus(team, cluster string) interface{} {
 		Status:    cl.Status,
 		Resources: cl.KubeResources,
 		Spec:      cl.Spec,
-		Error:	   cl.Error,
+		Error:     cl.Error,
 	}
 }