diff --git a/controllers/nginx/pkg/cmd/controller/metrics.go b/controllers/nginx/pkg/cmd/controller/metrics.go
index b803e6756..a865832cb 100644
--- a/controllers/nginx/pkg/cmd/controller/metrics.go
+++ b/controllers/nginx/pkg/cmd/controller/metrics.go
@@ -52,11 +52,9 @@ func (s *statsCollector) stop(sm statusModule) {
 	case defaultStatusModule:
 		s.basic.Stop()
 		prometheus.Unregister(s.basic)
-		break
 	case vtsStatusModule:
 		s.vts.Stop()
 		prometheus.Unregister(s.vts)
-		break
 	}
 }
 
diff --git a/controllers/nginx/pkg/metric/collector/vts.go b/controllers/nginx/pkg/metric/collector/vts.go
index 282e626a7..c06e74218 100644
--- a/controllers/nginx/pkg/metric/collector/vts.go
+++ b/controllers/nginx/pkg/metric/collector/vts.go
@@ -252,9 +252,9 @@ func (p vtsCollector) scrapeVts(ch chan<- prometheus.Metric) {
 			reflectMetrics(&zone.Cache, p.data.filterZoneCache, ch, p.ingressClass, p.watchNamespace, serverZone, country)
 
 			ch <- prometheus.MustNewConstMetric(p.data.filterZoneBytes,
-				prometheus.CounterValue, float64(zone.InBytes), p.ingressClass, p.watchNamespace, serverZone, country, "in")
+				prometheus.CounterValue, zone.InBytes, p.ingressClass, p.watchNamespace, serverZone, country, "in")
 			ch <- prometheus.MustNewConstMetric(p.data.filterZoneBytes,
-				prometheus.CounterValue, float64(zone.OutBytes), p.ingressClass, p.watchNamespace, serverZone, country, "out")
+				prometheus.CounterValue, zone.OutBytes, p.ingressClass, p.watchNamespace, serverZone, country, "out")
 		}
 	}
 }
@@ -266,7 +266,7 @@ func reflectMetrics(value interface{}, desc *prometheus.Desc, ch chan<- promethe
 		tag := val.Type().Field(i).Tag
 		l := append(labels, tag.Get("json"))
 		ch <- prometheus.MustNewConstMetric(desc,
-			prometheus.CounterValue, float64(val.Field(i).Interface().(float64)),
+			prometheus.CounterValue, val.Field(i).Interface().(float64),
 			l...)
 	}
 }
diff --git a/core/pkg/base64/base64.go b/core/pkg/base64/base64.go
index e6f808e99..6c4480148 100644
--- a/core/pkg/base64/base64.go
+++ b/core/pkg/base64/base64.go
@@ -5,8 +5,8 @@ import (
 	"strings"
 )
 
-// Base64Encode
-func Base64Encode(s string) string {
+// Encode encodes a string to base64 removing the equals character
+func Encode(s string) string {
 	str := base64.URLEncoding.EncodeToString([]byte(s))
 	return strings.Replace(str, "=", "", -1)
 }
diff --git a/core/pkg/ingress/annotations/authreq/main.go b/core/pkg/ingress/annotations/authreq/main.go
index 8289a7e33..4c46dd4d5 100644
--- a/core/pkg/ingress/annotations/authreq/main.go
+++ b/core/pkg/ingress/annotations/authreq/main.go
@@ -160,7 +160,7 @@ func (a authReq) Parse(ing *extensions.Ingress) (interface{}, error) {
 
 		harr := strings.Split(hstr, ",")
 		for _, header := range harr {
-			header := strings.TrimSpace(header)
+			header = strings.TrimSpace(header)
 			if len(header) > 0 {
 				if !validHeader(header) {
 					return nil, ing_errors.NewLocationDenied("invalid headers list")
diff --git a/core/pkg/ingress/annotations/ratelimit/main.go b/core/pkg/ingress/annotations/ratelimit/main.go
index 8d055bffa..1c173ec48 100644
--- a/core/pkg/ingress/annotations/ratelimit/main.go
+++ b/core/pkg/ingress/annotations/ratelimit/main.go
@@ -218,7 +218,7 @@ func (a ratelimit) Parse(ing *extensions.Ingress) (interface{}, error) {
 		LimitRate:      lr,
 		LimitRateAfter: lra,
 		Name:           zoneName,
-		ID:             base64.Base64Encode(zoneName),
+		ID:             base64.Encode(zoneName),
 		Whitelist:      cidrs,
 	}, nil
 }
diff --git a/core/pkg/ingress/controller/controller.go b/core/pkg/ingress/controller/controller.go
index 3809de92f..5a5f8af75 100644
--- a/core/pkg/ingress/controller/controller.go
+++ b/core/pkg/ingress/controller/controller.go
@@ -1015,7 +1015,7 @@ func (ic *GenericController) createServers(data []interface{},
 		fakeCertificatePath := fmt.Sprintf("%v/%v.pem", ingress.DefaultSSLDirectory, fakeCertificate)
 
 		// Only generates a new certificate if it doesn't exists physically
-		_, err := os.Stat(fakeCertificatePath)
+		_, err = os.Stat(fakeCertificatePath)
 		if err != nil {
 			glog.V(3).Infof("No Default SSL Certificate found. Generating a new one")
 			defCert, defKey := ssl.GetFakeSSLCert()
diff --git a/core/pkg/net/ssl/ssl_test.go b/core/pkg/net/ssl/ssl_test.go
index 6ee0b5721..564fc1d53 100644
--- a/core/pkg/net/ssl/ssl_test.go
+++ b/core/pkg/net/ssl/ssl_test.go
@@ -28,11 +28,6 @@ import (
 	"k8s.io/ingress/core/pkg/ingress"
 )
 
-const (
-	rsaBits  = 2048
-	validFor = 365 * 24 * time.Hour
-)
-
 // generateRSACerts generates a self signed certificate using a self generated ca
 func generateRSACerts(host string) (*triple.KeyPair, *triple.KeyPair, error) {
 	ca, err := triple.NewCA("self-sign-ca")