Update to address comments and linting.

Author: drewsilcock

const.go

@@ -19,10 +19,13 @@ type ConstVariable struct {
 	Pkg     *PackageDefinitions
 }
 
+// VariableName gets the bane for this const variable, taking into account comment overrides.
 func (cv *ConstVariable) VariableName() string {
 	if ignoreNameOverride(cv.Name.Name) {
 		return cv.Name.Name[1:]
-	} else if overriddenName := nameOverride(cv.Comment); overriddenName != "" {
+	}
+
+	if overriddenName := nameOverride(cv.Comment); overriddenName != "" {
 		return overriddenName
 	}
 

types.go

@@ -45,7 +45,9 @@ func (t *TypeSpecDef) Name() string {
 func (t *TypeSpecDef) TypeName() string {
 	if ignoreNameOverride(t.TypeSpec.Name.Name) {
 		return t.TypeSpec.Name.Name[1:]
-	} else if overriddenName := nameOverride(t.TypeSpec.Comment); overriddenName != "" {
+	}
+
+	if overriddenName := nameOverride(t.TypeSpec.Comment); overriddenName != "" {
 		return overriddenName
 	}