diff --git a/contrib/mesos/pkg/scheduler/components/deleter/deleter.go b/contrib/mesos/pkg/scheduler/components/deleter/deleter.go
index 52ea1e9140f..5fd7b67825b 100644
--- a/contrib/mesos/pkg/scheduler/components/deleter/deleter.go
+++ b/contrib/mesos/pkg/scheduler/components/deleter/deleter.go
@@ -22,11 +22,11 @@ import (
 	log "github.com/golang/glog"
 	"k8s.io/kubernetes/contrib/mesos/pkg/queue"
 	"k8s.io/kubernetes/contrib/mesos/pkg/runtime"
+	"k8s.io/kubernetes/contrib/mesos/pkg/scheduler"
 	merrors "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/errors"
 	"k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podtask"
 	"k8s.io/kubernetes/contrib/mesos/pkg/scheduler/queuer"
 	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/contrib/mesos/pkg/scheduler"
 )
 
 type Deleter interface {
diff --git a/contrib/mesos/pkg/scheduler/components/deleter/deleter_test.go b/contrib/mesos/pkg/scheduler/components/deleter/deleter_test.go
index 6e962341c0e..3b4882ef2f3 100644
--- a/contrib/mesos/pkg/scheduler/components/deleter/deleter_test.go
+++ b/contrib/mesos/pkg/scheduler/components/deleter/deleter_test.go
@@ -21,10 +21,10 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"k8s.io/kubernetes/contrib/mesos/pkg/queue"
+	types "k8s.io/kubernetes/contrib/mesos/pkg/scheduler"
 	merrors "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/errors"
 	"k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podtask"
 	"k8s.io/kubernetes/contrib/mesos/pkg/scheduler/queuer"
-	types "k8s.io/kubernetes/contrib/mesos/pkg/scheduler"
 	"k8s.io/kubernetes/pkg/api"
 )
 
diff --git a/contrib/mesos/pkg/scheduler/components/podreconciler/podreconciler.go b/contrib/mesos/pkg/scheduler/components/podreconciler/podreconciler.go
index 6873dd04c3d..72ce0bdeb35 100644
--- a/contrib/mesos/pkg/scheduler/components/podreconciler/podreconciler.go
+++ b/contrib/mesos/pkg/scheduler/components/podreconciler/podreconciler.go
@@ -20,11 +20,11 @@ import (
 	"time"
 
 	log "github.com/golang/glog"
+	"k8s.io/kubernetes/contrib/mesos/pkg/scheduler"
 	"k8s.io/kubernetes/contrib/mesos/pkg/scheduler/components/deleter"
 	merrors "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/errors"
 	"k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podtask"
 	"k8s.io/kubernetes/contrib/mesos/pkg/scheduler/queuer"
-	"k8s.io/kubernetes/contrib/mesos/pkg/scheduler"
 	"k8s.io/kubernetes/pkg/api"
 	apierrors "k8s.io/kubernetes/pkg/api/errors"
 	client "k8s.io/kubernetes/pkg/client/unversioned"
diff --git a/contrib/mesos/pkg/scheduler/components/tasksreconciler/tasksreconciler.go b/contrib/mesos/pkg/scheduler/components/tasksreconciler/tasksreconciler.go
index 9480d60963b..0712b3b0a2f 100644
--- a/contrib/mesos/pkg/scheduler/components/tasksreconciler/tasksreconciler.go
+++ b/contrib/mesos/pkg/scheduler/components/tasksreconciler/tasksreconciler.go
@@ -38,8 +38,8 @@ type TasksReconciler interface {
 type tasksReconciler struct {
 	proc.Doer
 	Action                             ReconcilerAction
-	explicit                           chan struct{}   // send an empty struct to trigger explicit reconciliation
-	implicit                           chan struct{}   // send an empty struct to trigger implicit reconciliation
+	explicit                           chan struct{} // send an empty struct to trigger explicit reconciliation
+	implicit                           chan struct{} // send an empty struct to trigger implicit reconciliation
 	cooldown                           time.Duration
 	explicitReconciliationAbortTimeout time.Duration
 }
diff --git a/contrib/mesos/pkg/scheduler/errors/errors.go b/contrib/mesos/pkg/scheduler/errors/errors.go
index ddeab132aec..cc3d2a1e59d 100644
--- a/contrib/mesos/pkg/scheduler/errors/errors.go
+++ b/contrib/mesos/pkg/scheduler/errors/errors.go
@@ -22,7 +22,7 @@ import (
 )
 
 var (
-	NoSuchPodErr  = errors.New("No such pod exists")
-	NoSuchTaskErr = errors.New("No such task exists")
+	NoSuchPodErr               = errors.New("No such pod exists")
+	NoSuchTaskErr              = errors.New("No such task exists")
 	ReconciliationCancelledErr = fmt.Errorf("explicit task reconciliation cancelled")
 )
diff --git a/contrib/mesos/pkg/scheduler/service/service.go b/contrib/mesos/pkg/scheduler/service/service.go
index e76c718e552..f5a73cc9ec3 100644
--- a/contrib/mesos/pkg/scheduler/service/service.go
+++ b/contrib/mesos/pkg/scheduler/service/service.go
@@ -54,6 +54,7 @@ import (
 	minioncfg "k8s.io/kubernetes/contrib/mesos/pkg/minion/config"
 	"k8s.io/kubernetes/contrib/mesos/pkg/profile"
 	"k8s.io/kubernetes/contrib/mesos/pkg/runtime"
+	"k8s.io/kubernetes/contrib/mesos/pkg/scheduler/components"
 	"k8s.io/kubernetes/contrib/mesos/pkg/scheduler/components/framework"
 	schedcfg "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/config"
 	"k8s.io/kubernetes/contrib/mesos/pkg/scheduler/ha"
@@ -74,7 +75,6 @@ import (
 	"k8s.io/kubernetes/pkg/master/ports"
 	etcdstorage "k8s.io/kubernetes/pkg/storage/etcd"
 	"k8s.io/kubernetes/pkg/tools"
-	"k8s.io/kubernetes/contrib/mesos/pkg/scheduler/components"
 )
 
 const (