From 1443dbf36623237a67f5681af2170f29b67d5445 Mon Sep 17 00:00:00 2001
From: Drew Silcock <drew.silcock@stfc.ac.uk>
Date: Mon, 29 Apr 2024 11:53:48 +0100
Subject: [PATCH] Update to address comments and linting.

---
 const.go | 5 ++++-
 types.go | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/const.go b/const.go
index 4256dc84a..59c1435bb 100644
--- a/const.go
+++ b/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
 	}
 
diff --git a/types.go b/types.go
index c6bd5d221..0c0051c87 100644
--- a/types.go
+++ b/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
 	}