diff --git a/collector/cpu_darwin.go b/collector/cpu_darwin.go
index 174e541f..4e3374f9 100644
--- a/collector/cpu_darwin.go
+++ b/collector/cpu_darwin.go
@@ -44,7 +44,7 @@ import (
 */
 import "C"
 
-// default value. from time.h
+// ClocksPerSec default value. from time.h
 const ClocksPerSec = float64(128)
 
 type statCollector struct {
@@ -55,8 +55,7 @@ func init() {
 	Factories["cpu"] = NewCPUCollector
 }
 
-// Takes a prometheus registry and returns a new Collector exposing
-// CPU stats.
+// NewCPUCollector returns a new Collector exposing CPU stats.
 func NewCPUCollector() (Collector, error) {
 	return &statCollector{
 		cpu: prometheus.NewDesc(
@@ -92,17 +91,17 @@ func (c *statCollector) Update(ch chan<- prometheus.Metric) error {
 
 	// the body of struct processor_cpu_load_info
 	// aka processor_cpu_load_info_data_t
-	var cpu_ticks [C.CPU_STATE_MAX]uint32
+	var cpuTicks [C.CPU_STATE_MAX]uint32
 
 	// copy the cpuload array to a []byte buffer
 	// where we can binary.Read the data
-	size := int(ncpu) * binary.Size(cpu_ticks)
+	size := int(ncpu) * binary.Size(cpuTicks)
 	buf := (*[1 << 30]byte)(unsafe.Pointer(cpuload))[:size:size]
 
 	bbuf := bytes.NewBuffer(buf)
 
 	for i := 0; i < int(ncpu); i++ {
-		err := binary.Read(bbuf, binary.LittleEndian, &cpu_ticks)
+		err := binary.Read(bbuf, binary.LittleEndian, &cpuTicks)
 		if err != nil {
 			return err
 		}
@@ -112,7 +111,7 @@ func (c *statCollector) Update(ch chan<- prometheus.Metric) error {
 			"nice":   C.CPU_STATE_NICE,
 			"idle":   C.CPU_STATE_IDLE,
 		} {
-			ch <- prometheus.MustNewConstMetric(c.cpu, prometheus.CounterValue, float64(cpu_ticks[v])/ClocksPerSec, "cpu"+strconv.Itoa(i), k)
+			ch <- prometheus.MustNewConstMetric(c.cpu, prometheus.CounterValue, float64(cpuTicks[v])/ClocksPerSec, "cpu"+strconv.Itoa(i), k)
 		}
 	}
 	return nil
diff --git a/collector/cpu_dragonfly.go b/collector/cpu_dragonfly.go
index db690b0a..a4961117 100644
--- a/collector/cpu_dragonfly.go
+++ b/collector/cpu_dragonfly.go
@@ -91,8 +91,7 @@ func init() {
 	Factories["cpu"] = NewStatCollector
 }
 
-// Takes a prometheus registry and returns a new Collector exposing
-// CPU stats.
+// NewStatCollector returns a new Collector exposing CPU stats.
 func NewStatCollector() (Collector, error) {
 	return &statCollector{
 		cpu: prometheus.NewDesc(
diff --git a/collector/cpu_freebsd.go b/collector/cpu_freebsd.go
index 72dc1f5d..e5d0bee7 100644
--- a/collector/cpu_freebsd.go
+++ b/collector/cpu_freebsd.go
@@ -89,8 +89,7 @@ func init() {
 	Factories["cpu"] = NewStatCollector
 }
 
-// Takes a prometheus registry and returns a new Collector exposing
-// CPU stats.
+// NewStatCollector returns a new Collector exposing CPU stats.
 func NewStatCollector() (Collector, error) {
 	return &statCollector{
 		cpu: typedDesc{prometheus.NewDesc(
diff --git a/collector/devstat_dragonfly.go b/collector/devstat_dragonfly.go
index af1e0ee4..63715b25 100644
--- a/collector/devstat_dragonfly.go
+++ b/collector/devstat_dragonfly.go
@@ -102,8 +102,7 @@ func init() {
 	Factories["devstat"] = NewDevstatCollector
 }
 
-// Takes a prometheus registry and returns a new Collector exposing
-// Device stats.
+// NewDevstatCollector returns a new Collector exposing Device stats.
 func NewDevstatCollector() (Collector, error) {
 	return &devstatCollector{
 		bytesDesc: prometheus.NewDesc(
diff --git a/collector/devstat_freebsd.go b/collector/devstat_freebsd.go
index 9b4760e4..5983f5a1 100644
--- a/collector/devstat_freebsd.go
+++ b/collector/devstat_freebsd.go
@@ -36,20 +36,18 @@ type devstatCollector struct {
 	mu      sync.Mutex
 	devinfo *C.struct_devinfo
 
-	bytes       typedDesc
-	bytes_total typedDesc
-	transfers   typedDesc
-	duration    typedDesc
-	busyTime    typedDesc
-	blocks      typedDesc
+	bytes     typedDesc
+	transfers typedDesc
+	duration  typedDesc
+	busyTime  typedDesc
+	blocks    typedDesc
 }
 
 func init() {
 	Factories["devstat"] = NewDevstatCollector
 }
 
-// Takes a prometheus registry and returns a new Collector exposing
-// Device stats.
+// NewDevstatCollector returns a new Collector exposing Device stats.
 func NewDevstatCollector() (Collector, error) {
 	return &devstatCollector{
 		devinfo: &C.struct_devinfo{},
diff --git a/collector/loadavg_solaris.go b/collector/loadavg_solaris.go
index 97253ca0..bf428d8a 100644
--- a/collector/loadavg_solaris.go
+++ b/collector/loadavg_solaris.go
@@ -32,9 +32,8 @@ import "C"
 func getLoad() ([]float64, error) {
 	var loadavg [3]C.double
 	samples := C.getloadavg(&loadavg[0], 3)
-	if samples > 0 {
-		return []float64{float64(loadavg[0]), float64(loadavg[1]), float64(loadavg[2])}, nil
-	} else {
+	if samples != 3 {
 		return nil, errors.New("failed to get load average")
 	}
+	return []float64{float64(loadavg[0]), float64(loadavg[1]), float64(loadavg[2])}, nil
 }
diff --git a/collector/loadavg_unix.go b/collector/loadavg_unix.go
index 4392611a..4d658852 100644
--- a/collector/loadavg_unix.go
+++ b/collector/loadavg_unix.go
@@ -26,9 +26,8 @@ import "C"
 func getLoad() ([]float64, error) {
 	var loadavg [3]C.double
 	samples := C.getloadavg(&loadavg[0], 3)
-	if samples > 0 {
-		return []float64{float64(loadavg[0]), float64(loadavg[1]), float64(loadavg[2])}, nil
-	} else {
+	if samples != 3 {
 		return nil, errors.New("failed to get load average")
 	}
+	return []float64{float64(loadavg[0]), float64(loadavg[1]), float64(loadavg[2])}, nil
 }
diff --git a/collector/sysctl_bsd.go b/collector/sysctl_bsd.go
index 1cc5ec6f..1aed5530 100644
--- a/collector/sysctl_bsd.go
+++ b/collector/sysctl_bsd.go
@@ -94,7 +94,7 @@ func (b bsdSysctl) Value() (float64, error) {
 		if len(raw) != (C.sizeof_time_t + C.sizeof_suseconds_t) {
 			// Shouldn't get here, unless the ABI changes...
 			return 0, fmt.Errorf(
-				"Length of bytes recieved from sysctl (%d) does not match expected bytes (%d).",
+				"length of bytes received from sysctl (%d) does not match expected bytes (%d)",
 				len(raw),
 				C.sizeof_time_t+C.sizeof_suseconds_t,
 			)
diff --git a/collector/tcpstat_linux.go b/collector/tcpstat_linux.go
index 794fb130..9f665a74 100644
--- a/collector/tcpstat_linux.go
+++ b/collector/tcpstat_linux.go
@@ -61,8 +61,7 @@ func init() {
 	Factories["tcpstat"] = NewTCPStatCollector
 }
 
-// NewTCPStatCollector takes a returns
-// a new Collector exposing network stats.
+// NewTCPStatCollector returns a new Collector exposing network stats.
 func NewTCPStatCollector() (Collector, error) {
 	return &tcpStatCollector{
 		desc: typedDesc{prometheus.NewDesc(