diff --git a/.codeclimate.yml b/.codeclimate.yml
index a7fd3c1b4..1eb2cdd5e 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -50,3 +50,5 @@ exclude_patterns:
   # CRI fields / consts, but make CodeClimate unhappy due to
   # underscores and "Id" instead of "ID"
   - "pkg/metadata/types/types.go"
+  # gofmt issue in the generated code
+  - "pkg/client/clientset/versioned/clientset.go"
diff --git a/cmd/virtlet/virtlet.go b/cmd/virtlet/virtlet.go
index 41c070ee5..9840b7e9c 100644
--- a/cmd/virtlet/virtlet.go
+++ b/cmd/virtlet/virtlet.go
@@ -124,8 +124,8 @@ func setLogLevel(config *v1.VirtletConfig) {
 func main() {
 	utils.HandleNsFixReexec()
 	clientCfg := utils.BindFlags(flag.CommandLine)
-	var cb *config.ConfigBinder
-	cb = config.NewConfigBinder(flag.CommandLine)
+	var cb *config.Binder
+	cb = config.NewBinder(flag.CommandLine)
 	flag.Parse()
 	localConfig := cb.GetConfig()
 
diff --git a/pkg/api/virtlet.k8s/v1/doc.go b/pkg/api/virtlet.k8s/v1/doc.go
index b2b67a60f..4d5a47467 100644
--- a/pkg/api/virtlet.k8s/v1/doc.go
+++ b/pkg/api/virtlet.k8s/v1/doc.go
@@ -18,5 +18,4 @@ limitations under the License.
 
 // Package v1 is the v1 version of the API.
 // +groupName=virtlet.k8s
-
 package v1
diff --git a/pkg/api/virtlet.k8s/v1/register.go b/pkg/api/virtlet.k8s/v1/register.go
index c7d1652bd..aa67bf30b 100644
--- a/pkg/api/virtlet.k8s/v1/register.go
+++ b/pkg/api/virtlet.k8s/v1/register.go
@@ -28,8 +28,9 @@ const (
 )
 
 var (
-	schemeBuilder      = runtime.NewSchemeBuilder(addKnownTypes)
-	scheme             = runtime.NewScheme()
+	schemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
+	scheme        = runtime.NewScheme()
+	// SchemeGroupVersion is group version used to register the objects
 	SchemeGroupVersion = schema.GroupVersion{Group: groupName, Version: version}
 	AddToScheme        = schemeBuilder.AddToScheme
 )
diff --git a/pkg/config/config.go b/pkg/config/config.go
index 662c2751a..03805326e 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -138,7 +138,7 @@ func mappingMatches(cm virtlet_v1.VirtletConfigMapping, nodeName string, nodeLab
 	return true
 }
 
-// MergeConfig merges several Virtlet configs together, with
+// MergeConfigs merges several Virtlet configs together, with
 // configs going later taking precedence.
 func MergeConfigs(configs []*virtlet_v1.VirtletConfig) *virtlet_v1.VirtletConfig {
 	var cfg *virtlet_v1.VirtletConfig
@@ -152,23 +152,23 @@ func MergeConfigs(configs []*virtlet_v1.VirtletConfig) *virtlet_v1.VirtletConfig
 	return cfg
 }
 
-// ConfigBinder is used to extract Virtlet config from a FlagSet.
-type ConfigBinder struct {
+// Binder is used to extract Virtlet config from a FlagSet.
+type Binder struct {
 	flagSet   *flag.FlagSet
 	config    *virtlet_v1.VirtletConfig
 	fieldSet  *fieldSet
 	lookupEnv envLookup
 }
 
-// NewConfigBinder returns a new ConfigBinder.
-func NewConfigBinder(flagSet *flag.FlagSet) *ConfigBinder {
+// NewBinder returns a new Binder.
+func NewBinder(flagSet *flag.FlagSet) *Binder {
 	config := &virtlet_v1.VirtletConfig{}
 	fs := configFieldSet(config)
 	fs.applyDefaults()
 	if flagSet != nil {
 		fs.addFlags(flagSet)
 	}
-	return &ConfigBinder{
+	return &Binder{
 		flagSet:  flagSet,
 		config:   config,
 		fieldSet: fs,
@@ -178,10 +178,10 @@ func NewConfigBinder(flagSet *flag.FlagSet) *ConfigBinder {
 // GetConfig returns the config that only includes the fields that
 // were explicitly set in the flags. It should be called after parsing
 // the flags.
-func (cb *ConfigBinder) GetConfig() *virtlet_v1.VirtletConfig {
-	cb.fieldSet.clearFieldsNotInFlagSet(cb.flagSet)
-	cb.fieldSet.setFromEnv(cb.lookupEnv)
-	return cb.config
+func (b *Binder) GetConfig() *virtlet_v1.VirtletConfig {
+	b.fieldSet.clearFieldsNotInFlagSet(b.flagSet)
+	b.fieldSet.setFromEnv(b.lookupEnv)
+	return b.config
 }
 
 // configForNode gets virtlet_v1.VirtletConfig for the specified node name and labels.
diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go
index 1a8083832..ebc456c46 100644
--- a/pkg/config/config_test.go
+++ b/pkg/config/config_test.go
@@ -61,7 +61,7 @@ func verifyEnv(t *testing.T, c *virtlet_v1.VirtletConfig) {
 			fakeEnv[parts[1]] = subparts[0]
 		}
 	}
-	binder := NewConfigBinder(nil)
+	binder := NewBinder(nil)
 	binder.lookupEnv = func(name string) (string, bool) {
 		r, found := fakeEnv[name]
 		return r, found
@@ -153,7 +153,7 @@ func TestMergeConfigs(t *testing.T) {
 	} {
 		t.Run(tc.name, func(t *testing.T) {
 			flags := flag.NewFlagSet("virtlet", flag.ContinueOnError)
-			configBinder := NewConfigBinder(flags)
+			configBinder := NewBinder(flags)
 			if err := flags.Parse(strings.Split(tc.args, " ")); err != nil {
 				t.Fatalf("error parsing flags: %v", err)
 			}