diff --git a/pkg/controller/service/service_controller.go b/pkg/controller/service/service_controller.go
index 38c6b99da2c..3496f0681ca 100644
--- a/pkg/controller/service/service_controller.go
+++ b/pkg/controller/service/service_controller.go
@@ -747,7 +747,7 @@ func (s *ServiceController) syncService(key string) error {
 	var cachedService *cachedService
 	var retryDelay time.Duration
 	defer func() {
-		glog.V(4).Infof("Finished syncing service %q (%v)", key, time.Now().Sub(startTime))
+		glog.V(4).Infof("Finished syncing service %q (%v)", key, time.Since(startTime))
 	}()
 
 	namespace, name, err := cache.SplitMetaNamespaceKey(key)
diff --git a/pkg/kubectl/explain/formatter.go b/pkg/kubectl/explain/formatter.go
index 5543dbf1bb9..ab9c53e9ed1 100644
--- a/pkg/kubectl/explain/formatter.go
+++ b/pkg/kubectl/explain/formatter.go
@@ -105,10 +105,10 @@ func wrapString(str string, wrap int) []string {
 	l := line{wrap: wrap}
 
 	for _, word := range words {
-		if l.Add(word) == false {
+		if !l.Add(word) {
 			wrapped = append(wrapped, l.String())
 			l = line{wrap: wrap}
-			if l.Add(word) == false {
+			if !l.Add(word) {
 				panic("Couldn't add to empty line.")
 			}
 		}
diff --git a/pkg/kubectl/plugins/plugins.go b/pkg/kubectl/plugins/plugins.go
index f2cc17847b3..7eca6a2f35f 100644
--- a/pkg/kubectl/plugins/plugins.go
+++ b/pkg/kubectl/plugins/plugins.go
@@ -65,7 +65,7 @@ func (p Plugin) Validate() error {
 	if len(p.Name) == 0 || len(p.ShortDesc) == 0 || (len(p.Command) == 0 && len(p.Tree) == 0) {
 		return ErrIncompletePlugin
 	}
-	if strings.Index(p.Name, " ") > -1 {
+	if strings.Contains(p.Name, " ") {
 		return ErrInvalidPluginName
 	}
 	for _, flag := range p.Flags {
@@ -102,7 +102,7 @@ func (f Flag) Validate() error {
 	if len(f.Name) == 0 || len(f.Desc) == 0 {
 		return ErrIncompleteFlag
 	}
-	if strings.Index(f.Name, " ") > -1 {
+	if strings.Contains(f.Name, " ") {
 		return ErrInvalidFlagName
 	}
 	return f.ValidateShorthand()