diff --git a/plugin/autopath/autopath.go b/plugin/autopath/autopath.go
index c2f541644..8583988d9 100644
--- a/plugin/autopath/autopath.go
+++ b/plugin/autopath/autopath.go
@@ -5,7 +5,7 @@ client's search path resolution by performing these lookups on the server...
 The server has a copy (via AutoPathFunc) of the client's search path and on
 receiving a query it first establishes if the suffix matches the FIRST configured
 element. If no match can be found the query will be forwarded up the plugin
-chain without interference (iff 'fallthrough' has been set).
+chain without interference (if 'fallthrough' has been set).
 
 If the query is deemed to fall in the search path the server will perform the
 queries with each element of the search path appended in sequence until a
diff --git a/plugin/cache/cache.go b/plugin/cache/cache.go
index 69de55f17..43a40c409 100644
--- a/plugin/cache/cache.go
+++ b/plugin/cache/cache.go
@@ -15,7 +15,7 @@ import (
 	"github.com/miekg/dns"
 )
 
-// Cache is plugin that looks up responses in a cache and caches replies.
+// Cache is a plugin that looks up responses in a cache and caches replies.
 // It has a success and a denial of existence cache.
 type Cache struct {
 	Next  plugin.Handler
diff --git a/plugin/dnssec/dnskey.go b/plugin/dnssec/dnskey.go
index ea769514d..1a2cf9343 100644
--- a/plugin/dnssec/dnskey.go
+++ b/plugin/dnssec/dnskey.go
@@ -79,12 +79,12 @@ func (d Dnssec) getDNSKEY(state request.Request, zone string, do bool, server st
 	return m
 }
 
-// Return true iff this is a zone key with the SEP bit unset. This implies a ZSK (rfc4034 2.1.1).
+// Return true if this is a zone key with the SEP bit unset. This implies a ZSK (rfc4034 2.1.1).
 func (k DNSKEY) isZSK() bool {
 	return k.K.Flags&(1<<8) == (1<<8) && k.K.Flags&1 == 0
 }
 
-// Return true iff this is a zone key with the SEP bit set. This implies a KSK (rfc4034 2.1.1).
+// Return true if this is a zone key with the SEP bit set. This implies a KSK (rfc4034 2.1.1).
 func (k DNSKEY) isKSK() bool {
 	return k.K.Flags&(1<<8) == (1<<8) && k.K.Flags&1 == 1
 }
diff --git a/plugin/forward/fuzz.go b/plugin/forward/fuzz.go
index cbb4edf01..0482f63ad 100644
--- a/plugin/forward/fuzz.go
+++ b/plugin/forward/fuzz.go
@@ -11,7 +11,7 @@ import (
 
 var f *Forward
 
-// abuse init to setup a environment to test against. This start another server to that will
+// abuse init to setup an environment to test against. This start another server to that will
 // reflect responses.
 func init() {
 	f = New()
diff --git a/plugin/kubernetes/autopath.go b/plugin/kubernetes/autopath.go
index 06bde0a69..33bf401f5 100644
--- a/plugin/kubernetes/autopath.go
+++ b/plugin/kubernetes/autopath.go
@@ -49,7 +49,7 @@ func (k *Kubernetes) AutoPath(state request.Request) []string {
 	return search
 }
 
-// podWithIP return the api.Pod for source IP ip. It returns nil if nothing can be found.
+// podWithIP return the api.Pod for source IP. It returns nil if nothing can be found.
 func (k *Kubernetes) podWithIP(ip string) *object.Pod {
 	ps := k.APIConn.PodIndex(ip)
 	if len(ps) == 0 {
diff --git a/plugin/kubernetes/object/service.go b/plugin/kubernetes/object/service.go
index 3c8304362..a41100ab9 100644
--- a/plugin/kubernetes/object/service.go
+++ b/plugin/kubernetes/object/service.go
@@ -46,7 +46,7 @@ func ToService(obj interface{}) interface{} {
 	}
 
 	if len(svc.Spec.Ports) == 0 {
-		// Add sentinal if there are no ports.
+		// Add sentinel if there are no ports.
 		s.Ports = []api.ServicePort{{Port: -1}}
 	} else {
 		s.Ports = make([]api.ServicePort, len(svc.Spec.Ports))
diff --git a/plugin/loadbalance/handler.go b/plugin/loadbalance/handler.go
index 4ec79c098..ac046c8d0 100644
--- a/plugin/loadbalance/handler.go
+++ b/plugin/loadbalance/handler.go
@@ -1,4 +1,4 @@
-// Package loadbalance is plugin for rewriting responses to do "load balancing"
+// Package loadbalance is a plugin for rewriting responses to do "load balancing"
 package loadbalance
 
 import (
@@ -9,7 +9,7 @@ import (
 	"github.com/miekg/dns"
 )
 
-// RoundRobin is plugin to rewrite responses for "load balancing".
+// RoundRobin is a plugin to rewrite responses for "load balancing".
 type RoundRobin struct {
 	Next plugin.Handler
 }
diff --git a/plugin/ready/list.go b/plugin/ready/list.go
index c283748ec..e7d2584d8 100644
--- a/plugin/ready/list.go
+++ b/plugin/ready/list.go
@@ -6,7 +6,7 @@ import (
 	"sync"
 )
 
-// list is structure that holds the plugins that signals readiness for this server block.
+// list is a structure that holds the plugins that signals readiness for this server block.
 type list struct {
 	sync.RWMutex
 	rs    []Readiness
diff --git a/plugin/rewrite/edns0.go b/plugin/rewrite/edns0.go
index 34aaf3d67..2872d089a 100644
--- a/plugin/rewrite/edns0.go
+++ b/plugin/rewrite/edns0.go
@@ -1,4 +1,4 @@
-// Package rewrite is plugin for rewriting requests internally to something different.
+// Package rewrite is a plugin for rewriting requests internally to something different.
 package rewrite
 
 import (
diff --git a/plugin/rewrite/rewrite.go b/plugin/rewrite/rewrite.go
index e72e975b2..2eabf6df2 100644
--- a/plugin/rewrite/rewrite.go
+++ b/plugin/rewrite/rewrite.go
@@ -29,7 +29,7 @@ const (
 	Continue = "continue"
 )
 
-// Rewrite is plugin to rewrite requests internally before being handled.
+// Rewrite is a plugin to rewrite requests internally before being handled.
 type Rewrite struct {
 	Next     plugin.Handler
 	Rules    []Rule
diff --git a/plugin/secondary/setup_test.go b/plugin/secondary/setup_test.go
index 47c8abac9..7fc36f679 100644
--- a/plugin/secondary/setup_test.go
+++ b/plugin/secondary/setup_test.go
@@ -55,7 +55,7 @@ func TestSecondaryParse(t *testing.T) {
 			}
 		}
 
-		// This is only set *iff* we have a zone (i.e. not in all tests above)
+		// This is only set *if* we have a zone (i.e. not in all tests above)
 		for _, v := range s.Z {
 			if x := v.TransferFrom[0]; x != test.transferFrom {
 				t.Fatalf("Test %d transform from names don't match expected %q, but got %q", i, test.transferFrom, x)