diff --git a/alertnotification_test.go b/alertnotification_test.go
index 0576354..3825ee1 100644
--- a/alertnotification_test.go
+++ b/alertnotification_test.go
@@ -1,8 +1,9 @@
 package gapi
 
 import (
-	"github.com/gobs/pretty"
 	"testing"
+
+	"github.com/gobs/pretty"
 )
 
 const (
@@ -121,7 +122,7 @@ func TestNewAlertNotification(t *testing.T) {
 		DisableResolveMessage: true,
 		SendReminder:          true,
 		Frequency:             "15m",
-		Settings:              map[string]string{
+		Settings: map[string]string{
 			"addresses": "dev@grafana.com",
 		},
 	}
@@ -149,7 +150,7 @@ func TestUpdateAlertNotification(t *testing.T) {
 		DisableResolveMessage: true,
 		SendReminder:          true,
 		Frequency:             "15m",
-		Settings:              map[string]string{
+		Settings: map[string]string{
 			"addresses": "dev@grafana.com",
 		},
 	}
diff --git a/dashboard_test.go b/dashboard_test.go
index 8c9a4ae..532ba0f 100644
--- a/dashboard_test.go
+++ b/dashboard_test.go
@@ -28,7 +28,7 @@ const (
 			"slug": "production-overview"
 		}
 	}`
-  
+
 	getDashboardsJSON = `[
     {
       "id": 1,
@@ -138,7 +138,7 @@ func TestDashboardDelete(t *testing.T) {
 		if err == nil {
 			t.Errorf("%d not detected", code)
 		}
-  }
+	}
 }
 
 func TestDashboards(t *testing.T) {
@@ -159,4 +159,4 @@ func TestDashboards(t *testing.T) {
 	if dashboards[0].Id != 1 || dashboards[0].Title != "Grafana Stats" {
 		t.Error("Not correctly parsing returned dashboards.")
 	}
-}
\ No newline at end of file
+}
diff --git a/datasource.go b/datasource.go
index 8e56506..df0f3a5 100644
--- a/datasource.go
+++ b/datasource.go
@@ -78,12 +78,12 @@ type JSONData struct {
 	// Used by Prometheus
 	HttpMethod   string `json:"httpMethod,omitempty"`
 	QueryTimeout string `json:"queryTimeout,omitempty"`
-	
+
 	// Used by Stackdriver
 	AuthenticationType string `json:"authenticationType,omitempty"`
-	ClientEmail 	   string `json:"clientEmail,omitempty"`
+	ClientEmail        string `json:"clientEmail,omitempty"`
 	DefaultProject     string `json:"defaultProject,omitempty"`
-	TokenUri 	   string `json:"tokenUri,omitempty"`
+	TokenUri           string `json:"tokenUri,omitempty"`
 }
 
 // SecureJSONData is a representation of the datasource `secureJsonData` property
@@ -98,7 +98,7 @@ type SecureJSONData struct {
 	// Used by Cloudwatch
 	AccessKey string `json:"accessKey,omitempty"`
 	SecretKey string `json:"secretKey,omitempty"`
-	
+
 	// Used by Stackdriver
 	PrivateKey string `json:"privateKey,omitempty"`
 }
diff --git a/folder_test.go b/folder_test.go
index f02f313..9c792c1 100644
--- a/folder_test.go
+++ b/folder_test.go
@@ -1,8 +1,9 @@
 package gapi
 
 import (
-	"github.com/gobs/pretty"
 	"testing"
+
+	"github.com/gobs/pretty"
 )
 
 const (
diff --git a/org_users_test.go b/org_users_test.go
index b03a9c2..37cf6c1 100644
--- a/org_users_test.go
+++ b/org_users_test.go
@@ -1,8 +1,9 @@
 package gapi
 
 import (
-	"github.com/gobs/pretty"
 	"testing"
+
+	"github.com/gobs/pretty"
 )
 
 const (
diff --git a/orgs_test.go b/orgs_test.go
index ca81ab4..a3432bf 100644
--- a/orgs_test.go
+++ b/orgs_test.go
@@ -1,8 +1,9 @@
 package gapi
 
 import (
-	"github.com/gobs/pretty"
 	"testing"
+
+	"github.com/gobs/pretty"
 )
 
 const (
diff --git a/user_test.go b/user_test.go
index dee1739..be64dcf 100644
--- a/user_test.go
+++ b/user_test.go
@@ -1,8 +1,9 @@
 package gapi
 
 import (
-	"github.com/gobs/pretty"
 	"testing"
+
+	"github.com/gobs/pretty"
 )
 
 const (