diff --git a/hugolib/site.go b/hugolib/site.go
index 4aa68aacf..f8a57dfa2 100644
--- a/hugolib/site.go
+++ b/hugolib/site.go
@@ -718,7 +718,7 @@ func (s *Site) reProcess(events []fsnotify.Event) (whatChanged, error) {
 
 	}
 
-	for shortcode, _ := range shortcodesChanged {
+	for shortcode := range shortcodesChanged {
 		// There are certain scenarios that, when a shortcode changes,
 		// it isn't sufficient to just rerender the already parsed shortcode.
 		// One example is if the user adds a new shortcode to the content file first,
diff --git a/output/layout_base.go b/output/layout_base.go
index 47d0c3d48..2bb89c20d 100644
--- a/output/layout_base.go
+++ b/output/layout_base.go
@@ -137,10 +137,10 @@ func CreateTemplateNames(d TemplateLookupDescriptor) (TemplateNames, error) {
 		// in the theme's layouts folder.
 		// Also note that the <current-path> may be both the project's layout folder and the theme's.
 		pairsToCheck := [][]string{
-			[]string{baseTemplatedDir, currBaseFilename},
-			[]string{baseTemplatedDir, baseFilename},
-			[]string{"_default", currBaseFilename},
-			[]string{"_default", baseFilename},
+			{baseTemplatedDir, currBaseFilename},
+			{baseTemplatedDir, baseFilename},
+			{"_default", currBaseFilename},
+			{"_default", baseFilename},
 		}
 
 	Loop: