diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go
index 5e95efabe..4c9dd8230 100644
--- a/pkg/controller/controller.go
+++ b/pkg/controller/controller.go
@@ -51,8 +51,8 @@ type CSISnapshotController struct {
 	snapshotListerSynced cache.InformerSynced
 	contentLister        storagelisters.VolumeSnapshotContentLister
 	contentListerSynced  cache.InformerSynced
-	classLister			 storagelisters.VolumeSnapshotClassLister
-	classListerSynced	 cache.InformerSynced
+	classLister          storagelisters.VolumeSnapshotClassLister
+	classListerSynced    cache.InformerSynced
 
 	snapshotStore cache.Store
 	contentStore  cache.Store
diff --git a/pkg/controller/csi_snapshot_controller.go b/pkg/controller/csi_snapshot_controller.go
index da9781b10..9bfd98295 100644
--- a/pkg/controller/csi_snapshot_controller.go
+++ b/pkg/controller/csi_snapshot_controller.go
@@ -27,11 +27,11 @@ import (
 	storage "k8s.io/api/storage/v1beta1"
 	apierrs "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/kubernetes/scheme"
 	ref "k8s.io/client-go/tools/reference"
 	"k8s.io/kubernetes/pkg/util/goroutinemap"
 	"k8s.io/kubernetes/pkg/util/goroutinemap/exponentialbackoff"
-	"k8s.io/apimachinery/pkg/labels"
 )
 
 // ==================================================================
@@ -389,9 +389,6 @@ func (ctrl *CSISnapshotController) updateSnapshotBoundWithEvent(snapshot *crdv1.
 		return snapshot, nil
 	}
 
-	// Emit the event only when the status change happens
-	//ctrl.eventRecorder.Event(snapshot, eventtype, reason, message)
-
 	snapshotClone := snapshot.DeepCopy()
 	snapshotClone.Status.Ready = true
 	snapshotClone.Status.Error = nil
@@ -688,9 +685,9 @@ func (ctrl *CSISnapshotController) GetClassFromVolumeSnapshot(snapshot *crdv1.Vo
 	} else {
 		// Find default snapshot class if available
 		list, err := ctrl.classLister.List(labels.Everything())
-        if err != nil {
-                return nil, err
-        }
+		if err != nil {
+			return nil, err
+		}
 		pvc, err := ctrl.getClaimFromVolumeSnapshot(snapshot)
 		if err != nil {
 			return nil, err
@@ -700,23 +697,23 @@ func (ctrl *CSISnapshotController) GetClassFromVolumeSnapshot(snapshot *crdv1.Vo
 			return nil, err
 		}
 		defaultClasses := []*crdv1.VolumeSnapshotClass{}
-		
-        for _, class := range list {
-                if IsDefaultAnnotation(class.ObjectMeta) && storageclass.Provisioner == class.Snapshotter {
-                        defaultClasses = append(defaultClasses, class)
-                        glog.V(4).Infof("getDefaultClass added: %s", class.Name)
-                }
-        }
-
-        if len(defaultClasses) == 0 {
-                return nil, nil
-        }
-        if len(defaultClasses) > 1 {
-                glog.V(4).Infof("getDefaultClass %d defaults found", len(defaultClasses))
-                return nil, fmt.Errorf("%d default StorageClasses were found", len(defaultClasses))
+
+		for _, class := range list {
+			if IsDefaultAnnotation(class.ObjectMeta) && storageclass.Provisioner == class.Snapshotter {
+				defaultClasses = append(defaultClasses, class)
+				glog.V(4).Infof("getDefaultClass added: %s", class.Name)
+			}
+		}
+
+		if len(defaultClasses) == 0 {
+			return nil, nil
+		}
+		if len(defaultClasses) > 1 {
+			glog.V(4).Infof("getDefaultClass %d defaults found", len(defaultClasses))
+			return nil, fmt.Errorf("%d default StorageClasses were found", len(defaultClasses))
 		}
 		glog.V(5).Infof("getClassFromVolumeSnapshot [%s]: default VolumeSnapshotClassName [%s]", snapshot.Name, defaultClasses[0])
-        return defaultClasses[0], nil
+		return defaultClasses[0], nil
 
 	}
 }
diff --git a/pkg/controller/util.go b/pkg/controller/util.go
index ce9c32ef8..c9d10285b 100644
--- a/pkg/controller/util.go
+++ b/pkg/controller/util.go
@@ -20,9 +20,9 @@ import (
 	"fmt"
 	"github.com/golang/glog"
 	crdv1 "github.com/kubernetes-csi/external-snapshotter/pkg/apis/volumesnapshot/v1alpha1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/meta"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/tools/cache"
 	"strconv"
 	"strings"
@@ -112,7 +112,6 @@ func GetSnapshotContentNameForSnapshot(snapshot *crdv1.VolumeSnapshot) string {
 	return "snapdata-" + string(snapshot.UID)
 }
 
-
 // IsDefaultAnnotation returns a boolean if
 // the annotation is set
 func IsDefaultAnnotation(obj metav1.ObjectMeta) bool {
@@ -121,4 +120,4 @@ func IsDefaultAnnotation(obj metav1.ObjectMeta) bool {
 	}
 
 	return false
-}
\ No newline at end of file
+}