diff --git a/config/config_helpers.go b/config/config_helpers.go
index 4cf667fd8..f19b78167 100644
--- a/config/config_helpers.go
+++ b/config/config_helpers.go
@@ -217,7 +217,8 @@ func (ctx *resolveContext) getParentDir() (string, error) {
 }
 
 // Returns the named environment variable or default value if it does not exist
-//     get_env(variable_name, default_value)
+//
+//	get_env(variable_name, default_value)
 func (ctx *resolveContext) getEnvironmentVariable(env, defValue string) string {
 	if value, exists := ctx.options.Env[env]; exists {
 		return value
diff --git a/configstack/running_module.go b/configstack/running_module.go
index 04b32aab8..da62d229f 100644
--- a/configstack/running_module.go
+++ b/configstack/running_module.go
@@ -161,9 +161,9 @@ func toRunningModules(modules []*TerraformModule, dependencyOrder dependencyOrde
 
 // Loop through the map of runningModules and for each module M:
 //
-// * If dependencyOrder is NormalOrder, plug in all the modules M depends on into the Dependencies field and all the
-//   modules that depend on M into the NotifyWhenDone field.
-// * If dependencyOrder is ReverseOrder, do the reverse.
+//   - If dependencyOrder is NormalOrder, plug in all the modules M depends on into the Dependencies field and all the
+//     modules that depend on M into the NotifyWhenDone field.
+//   - If dependencyOrder is ReverseOrder, do the reverse.
 func crossLinkDependencies(modules map[string]*runningModule, dependencyOrder dependencyOrder) (map[string]*runningModule, error) {
 	for _, module := range modules {
 		for _, dependency := range module.Module.Dependencies {
diff --git a/util/collections.go b/util/collections.go
index fda1c9aa3..30243ed82 100644
--- a/util/collections.go
+++ b/util/collections.go
@@ -44,9 +44,10 @@ func RemoveDuplicatesFromListKeepLast(list []string) []string {
 
 // RemoveDuplicatesFromList returns a copy of the given list with all duplicates removed (keeping the last encountereds)
 // Params:
-//   list: The list to filter
-//   keepLast: Indicates whether the last or first encountered duplicate element should be kept
-//	 getKey: Function used to extract the actual key from the string
+//
+//	  list: The list to filter
+//	  keepLast: Indicates whether the last or first encountered duplicate element should be kept
+//		 getKey: Function used to extract the actual key from the string
 func RemoveDuplicatesFromList(list []string, keepLast bool, getKey func(key string) string) []string {
 	out := make([]string, 0, len(list))
 	present := make(map[string]bool)
diff --git a/util/random.go b/util/random.go
index ea92172d8..3afd92045 100644
--- a/util/random.go
+++ b/util/random.go
@@ -6,7 +6,9 @@ import (
 )
 
 // GetRandomTime returns random time duration between the lower bound and upper bound. This is useful because some of our
-//  automated tests wound up flooding the AWS API all at once, leading to a "Subscriber limit exceeded" error.
+//
+//	automated tests wound up flooding the AWS API all at once, leading to a "Subscriber limit exceeded" error.
+//
 // TODO: Some of the more exotic test cases fail, but it's not worth catching them given the intended use of this function.
 func GetRandomTime(lowerBound, upperBound time.Duration) time.Duration {
 	if lowerBound < 0 {