diff --git a/schedulers/bpMaxMinProacCC.go b/schedulers/bpMaxMinProacCC.go
index 2af372f..1f834da 100644
--- a/schedulers/bpMaxMinProacCC.go
+++ b/schedulers/bpMaxMinProacCC.go
@@ -5,6 +5,8 @@ import (
 	"bitbucket.org/sunybingcloud/electron/def"
 	"bitbucket.org/sunybingcloud/electron/pcp"
 	"bitbucket.org/sunybingcloud/electron/rapl"
+	"bitbucket.org/sunybingcloud/electron/utilities/mesosUtils"
+	"bitbucket.org/sunybingcloud/electron/utilities/offerUtils"
 	"fmt"
 	"github.com/golang/protobuf/proto"
 	mesos "github.com/mesos/mesos-go/mesosproto"
@@ -17,8 +19,6 @@ import (
 	"strings"
 	"sync"
 	"time"
-	"bitbucket.org/sunybingcloud/electron/utilities/offerUtils"
-	"bitbucket.org/sunybingcloud/electron/utilities/mesosUtils"
 )
 
 // Decides if to take an offer or not
diff --git a/schedulers/bpswClassMapWatts.go b/schedulers/bpswClassMapWatts.go
index d35629b..a648e15 100644
--- a/schedulers/bpswClassMapWatts.go
+++ b/schedulers/bpswClassMapWatts.go
@@ -2,6 +2,8 @@ package schedulers
 
 import (
 	"bitbucket.org/sunybingcloud/electron/def"
+	"bitbucket.org/sunybingcloud/electron/utilities/mesosUtils"
+	"bitbucket.org/sunybingcloud/electron/utilities/offerUtils"
 	"fmt"
 	"github.com/golang/protobuf/proto"
 	mesos "github.com/mesos/mesos-go/mesosproto"
@@ -12,8 +14,6 @@ import (
 	"sort"
 	"strings"
 	"time"
-	"bitbucket.org/sunybingcloud/electron/utilities/offerUtils"
-	"bitbucket.org/sunybingcloud/electron/utilities/mesosUtils"
 )
 
 // Decides if to take an offer or not
diff --git a/schedulers/firstfitSortedWattsClassMapWattsProacCC.go b/schedulers/firstfitSortedWattsClassMapWattsProacCC.go
index f083ffb..f822b9a 100644
--- a/schedulers/firstfitSortedWattsClassMapWattsProacCC.go
+++ b/schedulers/firstfitSortedWattsClassMapWattsProacCC.go
@@ -5,6 +5,8 @@ import (
 	"bitbucket.org/sunybingcloud/electron/def"
 	"bitbucket.org/sunybingcloud/electron/pcp"
 	"bitbucket.org/sunybingcloud/electron/rapl"
+	"bitbucket.org/sunybingcloud/electron/utilities/mesosUtils"
+	"bitbucket.org/sunybingcloud/electron/utilities/offerUtils"
 	"fmt"
 	"github.com/golang/protobuf/proto"
 	mesos "github.com/mesos/mesos-go/mesosproto"
@@ -17,8 +19,6 @@ import (
 	"strings"
 	"sync"
 	"time"
-	"bitbucket.org/sunybingcloud/electron/utilities/offerUtils"
-	"bitbucket.org/sunybingcloud/electron/utilities/mesosUtils"
 )
 
 // electron scheduler implements the Scheduler interface
diff --git a/schedulers/proactiveclusterwidecappingfcfs.go b/schedulers/proactiveclusterwidecappingfcfs.go
index b7491f7..9fc5695 100644
--- a/schedulers/proactiveclusterwidecappingfcfs.go
+++ b/schedulers/proactiveclusterwidecappingfcfs.go
@@ -5,6 +5,8 @@ import (
 	"bitbucket.org/sunybingcloud/electron/def"
 	"bitbucket.org/sunybingcloud/electron/pcp"
 	"bitbucket.org/sunybingcloud/electron/rapl"
+	"bitbucket.org/sunybingcloud/electron/utilities/mesosUtils"
+	"bitbucket.org/sunybingcloud/electron/utilities/offerUtils"
 	"fmt"
 	"github.com/golang/protobuf/proto"
 	mesos "github.com/mesos/mesos-go/mesosproto"
@@ -16,8 +18,6 @@ import (
 	"strings"
 	"sync"
 	"time"
-	"bitbucket.org/sunybingcloud/electron/utilities/offerUtils"
-	"bitbucket.org/sunybingcloud/electron/utilities/mesosUtils"
 )
 
 // Decides if to take an offer or not
diff --git a/utilities/mesosUtils/mesosUtils.go b/utilities/mesosUtils/mesosUtils.go
index be3d55b..dcc5e77 100644
--- a/utilities/mesosUtils/mesosUtils.go
+++ b/utilities/mesosUtils/mesosUtils.go
@@ -1,8 +1,8 @@
 package mesosUtils
 
 import (
-	mesos "github.com/mesos/mesos-go/mesosproto"
 	"github.com/golang/protobuf/proto"
+	mesos "github.com/mesos/mesos-go/mesosproto"
 )
 
 var (
diff --git a/utilities/runAvg/runAvg.go b/utilities/runAvg/runAvg.go
index c12efa9..297dea4 100644
--- a/utilities/runAvg/runAvg.go
+++ b/utilities/runAvg/runAvg.go
@@ -32,7 +32,7 @@ func getInstance(curSum float64, wSize int) *runningAverageCalculator {
 	if racSingleton == nil {
 		racSingleton = &runningAverageCalculator{
 			considerationWindowSize: wSize,
-			currentSum: curSum,
+			currentSum:              curSum,
 		}
 		return racSingleton
 	} else {