diff --git a/hack/.golint_failures b/hack/.golint_failures
index a128f3259f9..9d27a33ccfb 100644
--- a/hack/.golint_failures
+++ b/hack/.golint_failures
@@ -47,13 +47,9 @@ pkg/apis/rbac/v1
 pkg/apis/rbac/v1alpha1
 pkg/apis/rbac/v1beta1
 pkg/apis/rbac/validation
-pkg/apis/scheduling
 pkg/apis/storage
-pkg/apis/storage/util
 pkg/apis/storage/v1
-pkg/apis/storage/v1/util
 pkg/apis/storage/v1beta1
-pkg/apis/storage/v1beta1/util
 pkg/cloudprovider/providers/fake
 pkg/cloudprovider/providers/photon
 pkg/controller
diff --git a/pkg/apis/scheduling/register.go b/pkg/apis/scheduling/register.go
index c3a611049a6..664b5bd2512 100644
--- a/pkg/apis/scheduling/register.go
+++ b/pkg/apis/scheduling/register.go
@@ -38,8 +38,10 @@ func Resource(resource string) schema.GroupResource {
 }
 
 var (
+	// SchemeBuilder points to a list of functions added to Scheme.
 	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
-	AddToScheme   = SchemeBuilder.AddToScheme
+	// AddToScheme applies all the stored functions to the scheme.
+	AddToScheme = SchemeBuilder.AddToScheme
 )
 
 func addKnownTypes(scheme *runtime.Scheme) error {
diff --git a/pkg/apis/scheduling/types.go b/pkg/apis/scheduling/types.go
index 185eb81c59b..3a6437731c8 100644
--- a/pkg/apis/scheduling/types.go
+++ b/pkg/apis/scheduling/types.go
@@ -29,11 +29,13 @@ const (
 	SystemCriticalPriority = 2 * HighestUserDefinablePriority
 	// SystemPriorityClassPrefix is the prefix reserved for system priority class names. Other priority
 	// classes are not allowed to start with this prefix.
-	SystemPriorityClassPrefix = "system-"
 	// NOTE: In order to avoid conflict of names with user-defined priority classes, all the names must
 	// start with SystemPriorityClassPrefix.
+	SystemPriorityClassPrefix = "system-"
+	// SystemClusterCritical is the system priority class name that represents cluster-critical.
 	SystemClusterCritical = SystemPriorityClassPrefix + "cluster-critical"
-	SystemNodeCritical    = SystemPriorityClassPrefix + "node-critical"
+	// SystemNodeCritical is the system priority class name that represents node-critical.
+	SystemNodeCritical = SystemPriorityClassPrefix + "node-critical"
 )
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
diff --git a/pkg/apis/storage/util/helpers.go b/pkg/apis/storage/util/helpers.go
index 62c27ccfc19..69dcf57ac99 100644
--- a/pkg/apis/storage/util/helpers.go
+++ b/pkg/apis/storage/util/helpers.go
@@ -20,8 +20,10 @@ import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 // IsDefaultStorageClassAnnotation represents a StorageClass annotation that
 // marks a class as the default StorageClass
-//TODO: remove Beta when no longer used
 const IsDefaultStorageClassAnnotation = "storageclass.kubernetes.io/is-default-class"
+
+// BetaIsDefaultStorageClassAnnotation is the beta version of IsDefaultStorageClassAnnotation.
+// TODO: remove Beta when no longer used
 const BetaIsDefaultStorageClassAnnotation = "storageclass.beta.kubernetes.io/is-default-class"
 
 // IsDefaultAnnotationText returns a pretty Yes/No String if
diff --git a/pkg/apis/storage/v1/util/helpers.go b/pkg/apis/storage/v1/util/helpers.go
index d0d5ad7ba99..c18803ca671 100644
--- a/pkg/apis/storage/v1/util/helpers.go
+++ b/pkg/apis/storage/v1/util/helpers.go
@@ -22,8 +22,10 @@ import (
 
 // IsDefaultStorageClassAnnotation represents a StorageClass annotation that
 // marks a class as the default StorageClass
-//TODO: remove Beta when no longer used
 const IsDefaultStorageClassAnnotation = "storageclass.kubernetes.io/is-default-class"
+
+// BetaIsDefaultStorageClassAnnotation is the beta version of IsDefaultStorageClassAnnotation.
+// TODO: remove Beta when no longer used
 const BetaIsDefaultStorageClassAnnotation = "storageclass.beta.kubernetes.io/is-default-class"
 
 // IsDefaultAnnotationText returns a pretty Yes/No String if
diff --git a/pkg/apis/storage/v1beta1/util/helpers.go b/pkg/apis/storage/v1beta1/util/helpers.go
index 62c27ccfc19..69dcf57ac99 100644
--- a/pkg/apis/storage/v1beta1/util/helpers.go
+++ b/pkg/apis/storage/v1beta1/util/helpers.go
@@ -20,8 +20,10 @@ import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 // IsDefaultStorageClassAnnotation represents a StorageClass annotation that
 // marks a class as the default StorageClass
-//TODO: remove Beta when no longer used
 const IsDefaultStorageClassAnnotation = "storageclass.kubernetes.io/is-default-class"
+
+// BetaIsDefaultStorageClassAnnotation is the beta version of IsDefaultStorageClassAnnotation.
+// TODO: remove Beta when no longer used
 const BetaIsDefaultStorageClassAnnotation = "storageclass.beta.kubernetes.io/is-default-class"
 
 // IsDefaultAnnotationText returns a pretty Yes/No String if
diff --git a/pkg/kubectl/util/storage/storage.go b/pkg/kubectl/util/storage/storage.go
index c62cc4ea127..b584a4da867 100644
--- a/pkg/kubectl/util/storage/storage.go
+++ b/pkg/kubectl/util/storage/storage.go
@@ -28,7 +28,7 @@ import (
 // marks a class as the default StorageClass
 const IsDefaultStorageClassAnnotation = "storageclass.kubernetes.io/is-default-class"
 
-// BetaIsDefaultStorageClassAnnotation is the beta version of BetaIsDefaultStorageClassAnnotation.
+// BetaIsDefaultStorageClassAnnotation is the beta version of IsDefaultStorageClassAnnotation.
 const BetaIsDefaultStorageClassAnnotation = "storageclass.beta.kubernetes.io/is-default-class"
 
 // IsDefaultAnnotationText returns a pretty Yes/No String if