diff --git a/def/task.go b/def/task.go
index 524e9e5..62ab993 100644
--- a/def/task.go
+++ b/def/task.go
@@ -8,15 +8,15 @@ import (
 )
 
 type Task struct {
-	Name      string  `json:"name"`
-	CPU       float64 `json:"cpu"`
-	RAM       float64 `json:"ram"`
-	Watts     float64 `json:"watts"`
-	Image     string  `json:"image"`
-	CMD       string  `json:"cmd"`
-	Instances *int    `json:"inst"`
-	Host      string  `json:"host"`
-	TaskID    string  `json:"taskID"`
+	Name         string             `json:"name"`
+	CPU          float64            `json:"cpu"`
+	RAM          float64            `json:"ram"`
+	Watts        float64            `json:"watts"`
+	Image        string             `json:"image"`
+	CMD          string             `json:"cmd"`
+	Instances    *int               `json:"inst"`
+	Host         string             `json:"host"`
+	TaskID       string             `json:"taskID"`
 	ClassToWatts map[string]float64 `json:"class_to_watts"`
 }
 
diff --git a/pcp/proactiveclusterwidecappers.go b/pcp/proactiveclusterwidecappers.go
index 599e1f8..7281b72 100644
--- a/pcp/proactiveclusterwidecappers.go
+++ b/pcp/proactiveclusterwidecappers.go
@@ -29,7 +29,7 @@ func (tw taskWrapper) ID() string {
 }
 
 // Cluster wide capper
-type ClusterwideCapper struct {}
+type ClusterwideCapper struct{}
 
 // Defining constructor for clusterwideCapper. Please don't call this directly and instead use GetClusterwideCapperInstance()
 func newClusterwideCapper() *ClusterwideCapper {
diff --git a/scheduler.go b/scheduler.go
index e9a944d..8c125b2 100644
--- a/scheduler.go
+++ b/scheduler.go
@@ -2,8 +2,8 @@ package main
 
 import (
 	"bitbucket.org/sunybingcloud/electron/def"
-	"bitbucket.org/sunybingcloud/electron/schedulers"
 	"bitbucket.org/sunybingcloud/electron/pcp"
+	"bitbucket.org/sunybingcloud/electron/schedulers"
 	"flag"
 	"fmt"
 	"github.com/golang/protobuf/proto"
diff --git a/schedulers/bpswClassMapWatts.go b/schedulers/bpswClassMapWatts.go
index 5307807..4b9deb9 100644
--- a/schedulers/bpswClassMapWatts.go
+++ b/schedulers/bpswClassMapWatts.go
@@ -170,7 +170,7 @@ func (s *BPSWClassMapWatts) ResourceOffers(driver sched.SchedulerDriver, offers
 				// Does the task fit
 				// OR lazy evaluation. If ignore watts is set to true, second statement won't
 				// be evaluated.
-				if (s.ignoreWatts || (offerWatts >= (totalWatts+task.ClassToWatts[nodeClass]))) &&
+				if (s.ignoreWatts || (offerWatts >= (totalWatts + task.ClassToWatts[nodeClass]))) &&
 					(offerCPU >= (totalCPU + task.CPU)) &&
 					(offerRAM >= (totalRAM + task.RAM)) {
 
diff --git a/schedulers/proactiveclusterwidecappingranked.go b/schedulers/proactiveclusterwidecappingranked.go
index 85e8537..a1bf4d4 100644
--- a/schedulers/proactiveclusterwidecappingranked.go
+++ b/schedulers/proactiveclusterwidecappingranked.go
@@ -264,7 +264,7 @@ func (s *ProactiveClusterwideCapRanked) ResourceOffers(driver sched.SchedulerDri
 	}
 
 	// sorting the tasks in ascending order of watts.
-	if (len(s.tasks) > 0) {
+	if len(s.tasks) > 0 {
 		sort.Sort(def.WattsSorter(s.tasks))
 		// calculating the total number of tasks ranked.
 		numberOfRankedTasks := 0
diff --git a/utilities/runAvg/runAvg.go b/utilities/runAvg/runAvg.go
index f022715..592929f 100644
--- a/utilities/runAvg/runAvg.go
+++ b/utilities/runAvg/runAvg.go
@@ -7,8 +7,8 @@ One should implement Val() to be able to use this utility.
 package runAvg
 
 import (
-	"errors"
 	"container/list"
+	"errors"
 )
 
 type Interface interface {
@@ -19,7 +19,7 @@ type Interface interface {
 }
 
 type runningAverageCalculator struct {
-	window list.List
+	window     list.List
 	windowSize int
 	currentSum float64
 }
@@ -30,7 +30,7 @@ var racSingleton *runningAverageCalculator
 // return single instance
 func getInstance(curSum float64, wSize int) *runningAverageCalculator {
 	if racSingleton == nil {
-		racSingleton = &runningAverageCalculator {
+		racSingleton = &runningAverageCalculator{
 			windowSize: wSize,
 			currentSum: curSum,
 		}
@@ -55,7 +55,7 @@ func (rac *runningAverageCalculator) calculate(data Interface) float64 {
 		elementToRemove := rac.window.Front()
 		rac.currentSum -= elementToRemove.Value.(Interface).Val()
 		rac.window.Remove(elementToRemove)
-		
+
 		// adding new element to the window
 		rac.window.PushBack(data)
 		rac.currentSum += data.Val()
@@ -105,4 +105,4 @@ func Init() {
 	racSingleton.window.Init()
 	racSingleton.windowSize = 0
 	racSingleton.currentSum = 0.0
-}
\ No newline at end of file
+}