diff --git a/language/visitor/visitor_test.go b/language/visitor/visitor_test.go
index 436560d8..898c89ae 100644
--- a/language/visitor/visitor_test.go
+++ b/language/visitor/visitor_test.go
@@ -51,7 +51,7 @@ func TestVisitor_AllowsEditingANodeBothOnEnterAndOnLeave(t *testing.T) {
 	v := &visitor.VisitorOptions{
 
 		KindFuncMap: map[string]visitor.NamedVisitFuncs{
-			kinds.OperationDefinition: visitor.NamedVisitFuncs{
+			kinds.OperationDefinition: {
 				Enter: func(p visitor.VisitFuncParams) (string, interface{}) {
 					if node, ok := p.Node.(*ast.OperationDefinition); ok {
 						selectionSet = node.SelectionSet
@@ -120,7 +120,7 @@ func TestVisitor_AllowsEditingTheRootNodeOnEnterAndOnLeave(t *testing.T) {
 	v := &visitor.VisitorOptions{
 
 		KindFuncMap: map[string]visitor.NamedVisitFuncs{
-			kinds.Document: visitor.NamedVisitFuncs{
+			kinds.Document: {
 				Enter: func(p visitor.VisitFuncParams) (string, interface{}) {
 					if node, ok := p.Node.(*ast.Document); ok {
 						visited["didEnter"] = true
@@ -931,7 +931,7 @@ func TestVisitor_VisitInParallel_AllowsSkippingDifferentSubTrees(t *testing.T) {
 	}
 
 	v := []*visitor.VisitorOptions{
-		&visitor.VisitorOptions{
+		{
 			Enter: func(p visitor.VisitFuncParams) (string, interface{}) {
 				switch node := p.Node.(type) {
 				case *ast.Name:
@@ -960,7 +960,7 @@ func TestVisitor_VisitInParallel_AllowsSkippingDifferentSubTrees(t *testing.T) {
 				return visitor.ActionNoChange, nil
 			},
 		},
-		&visitor.VisitorOptions{
+		{
 			Enter: func(p visitor.VisitFuncParams) (string, interface{}) {
 				switch node := p.Node.(type) {
 				case *ast.Name:
diff --git a/rules.go b/rules.go
index c5be3f03..3b3c4456 100644
--- a/rules.go
+++ b/rules.go
@@ -146,12 +146,12 @@ func DefaultValuesOfCorrectTypeRule(context *ValidationContext) *ValidationRuleI
 					return visitor.ActionSkip, nil
 				},
 			},
-			kinds.SelectionSet: visitor.NamedVisitFuncs{
+			kinds.SelectionSet: {
 				Kind: func(p visitor.VisitFuncParams) (string, interface{}) {
 					return visitor.ActionSkip, nil
 				},
 			},
-			kinds.FragmentDefinition: visitor.NamedVisitFuncs{
+			kinds.FragmentDefinition: {
 				Kind: func(p visitor.VisitFuncParams) (string, interface{}) {
 					return visitor.ActionSkip, nil
 				},
@@ -1875,7 +1875,7 @@ func UniqueInputFieldNamesRule(context *ValidationContext) *ValidationRuleInstan
 
 	visitorOpts := &visitor.VisitorOptions{
 		KindFuncMap: map[string]visitor.NamedVisitFuncs{
-			kinds.ObjectValue: visitor.NamedVisitFuncs{
+			kinds.ObjectValue: {
 				Enter: func(p visitor.VisitFuncParams) (string, interface{}) {
 					knownNameStack = append(knownNameStack, knownNames)
 					knownNames = map[string]*ast.Name{}
@@ -1887,7 +1887,7 @@ func UniqueInputFieldNamesRule(context *ValidationContext) *ValidationRuleInstan
 					return visitor.ActionNoChange, nil
 				},
 			},
-			kinds.ObjectField: visitor.NamedVisitFuncs{
+			kinds.ObjectField: {
 				Kind: func(p visitor.VisitFuncParams) (string, interface{}) {
 					if node, ok := p.Node.(*ast.ObjectField); ok {
 						fieldName := ""
@@ -1943,7 +1943,7 @@ func UniqueOperationNamesRule(context *ValidationContext) *ValidationRuleInstanc
 					return visitor.ActionSkip, nil
 				},
 			},
-			kinds.FragmentDefinition: visitor.NamedVisitFuncs{
+			kinds.FragmentDefinition: {
 				Kind: func(p visitor.VisitFuncParams) (string, interface{}) {
 					return visitor.ActionSkip, nil
 				},
@@ -1963,7 +1963,7 @@ func UniqueVariableNamesRule(context *ValidationContext) *ValidationRuleInstance
 
 	visitorOpts := &visitor.VisitorOptions{
 		KindFuncMap: map[string]visitor.NamedVisitFuncs{
-			kinds.OperationDefinition: visitor.NamedVisitFuncs{
+			kinds.OperationDefinition: {
 				Kind: func(p visitor.VisitFuncParams) (string, interface{}) {
 					if node, ok := p.Node.(*ast.OperationDefinition); ok && node != nil {
 						knownVariableNames = map[string]*ast.Name{}
@@ -1971,7 +1971,7 @@ func UniqueVariableNamesRule(context *ValidationContext) *ValidationRuleInstance
 					return visitor.ActionNoChange, nil
 				},
 			},
-			kinds.VariableDefinition: visitor.NamedVisitFuncs{
+			kinds.VariableDefinition: {
 				Kind: func(p visitor.VisitFuncParams) (string, interface{}) {
 					if node, ok := p.Node.(*ast.VariableDefinition); ok && node != nil {
 						variableName := ""
diff --git a/validator.go b/validator.go
index 1e057935..7baf109f 100644
--- a/validator.go
+++ b/validator.go
@@ -231,12 +231,12 @@ func (ctx *ValidationContext) VariableUsages(node HasSelectionSet) []*VariableUs
 
 	visitor.Visit(node, visitor.VisitWithTypeInfo(typeInfo, &visitor.VisitorOptions{
 		KindFuncMap: map[string]visitor.NamedVisitFuncs{
-			kinds.VariableDefinition: visitor.NamedVisitFuncs{
+			kinds.VariableDefinition: {
 				Kind: func(p visitor.VisitFuncParams) (string, interface{}) {
 					return visitor.ActionSkip, nil
 				},
 			},
-			kinds.Variable: visitor.NamedVisitFuncs{
+			kinds.Variable: {
 				Kind: func(p visitor.VisitFuncParams) (string, interface{}) {
 					if node, ok := p.Node.(*ast.Variable); ok && node != nil {
 						usages = append(usages, &VariableUsage{
diff --git a/variables_test.go b/variables_test.go
index 545f3c7d..ff815f0c 100644
--- a/variables_test.go
+++ b/variables_test.go
@@ -533,7 +533,7 @@ func TestVariables_ObjectsAndNullability_UsingVariables_ErrorsOnDeepNestedErrors
 					"\nIn field \"na\": In field \"c\": Expected \"String!\", found null." +
 					"\nIn field \"nb\": Expected \"String!\", found null.",
 				Locations: []location.SourceLocation{
-					location.SourceLocation{
+					{
 						Line: 2, Column: 19,
 					},
 				},