diff --git a/cmd/generate-fix/internal/helpers.go b/cmd/generate-fix/internal/helpers.go
index 7b4a96fe13c8362246cecf208649ac21dbd99813..dba773d89e2d4a194d47cbad55b19d42a95b5f4d 100644
--- a/cmd/generate-fix/internal/helpers.go
+++ b/cmd/generate-fix/internal/helpers.go
@@ -18,4 +18,4 @@ func getImportPathRoot() string {
 	goSrcPath := filepath.Join(os.Getenv("GOPATH"), "src")
 	importPathRoot := filepath.ToSlash(strings.Replace(pwd, goSrcPath, "", 1))
 	return strings.TrimLeft(importPathRoot, "/")
-}
\ No newline at end of file
+}
diff --git a/repeating_group_test.go b/repeating_group_test.go
index d43d38d79f6072e26d1fb423e605eb736ec5afae..448e39d6a74cf21474ed54ffe333d655e6dba4e7 100644
--- a/repeating_group_test.go
+++ b/repeating_group_test.go
@@ -97,16 +97,16 @@ func TestRepeatingGroup_ReadError(t *testing.T) {
 	}{
 		{
 			[]TagValue{
-				TagValue{value: []byte("1")},
-				TagValue{tag: Tag(2), value: []byte("not in template")},
-				TagValue{tag: Tag(1), value: []byte("hello")},
+				{value: []byte("1")},
+				{tag: Tag(2), value: []byte("not in template")},
+				{tag: Tag(1), value: []byte("hello")},
 			}, 0},
 		{
 			[]TagValue{
-				TagValue{value: []byte("2")},
-				TagValue{tag: Tag(1), value: []byte("hello")},
-				TagValue{tag: Tag(2), value: []byte("not in template")},
-				TagValue{tag: Tag(1), value: []byte("hello")},
+				{value: []byte("2")},
+				{tag: Tag(1), value: []byte("hello")},
+				{tag: Tag(2), value: []byte("not in template")},
+				{tag: Tag(1), value: []byte("hello")},
 			}, 1}}
 
 	for _, s := range tests {
@@ -128,29 +128,29 @@ func TestRepeatingGroup_Read(t *testing.T) {
 		tv               []TagValue
 		expectedGroupTvs [][]TagValue
 	}{
-		{singleFieldTemplate, []TagValue{TagValue{value: []byte("0")}},
+		{singleFieldTemplate, []TagValue{{value: []byte("0")}},
 			[][]TagValue{}},
-		{singleFieldTemplate, []TagValue{TagValue{value: []byte("1")}, TagValue{tag: Tag(1), value: []byte("hello")}},
+		{singleFieldTemplate, []TagValue{{value: []byte("1")}, {tag: Tag(1), value: []byte("hello")}},
 			[][]TagValue{{TagValue{tag: Tag(1), value: []byte("hello")}}}},
 		{singleFieldTemplate,
-			[]TagValue{TagValue{value: []byte("1")},
-				TagValue{tag: Tag(1), value: []byte("hello")},
-				TagValue{tag: Tag(2), value: []byte("not in group")}},
+			[]TagValue{{value: []byte("1")},
+				{tag: Tag(1), value: []byte("hello")},
+				{tag: Tag(2), value: []byte("not in group")}},
 			[][]TagValue{
 				{TagValue{tag: Tag(1), value: []byte("hello")}}}},
 		{singleFieldTemplate,
-			[]TagValue{TagValue{value: []byte("2")},
-				TagValue{tag: Tag(1), value: []byte("hello")},
-				TagValue{tag: Tag(1), value: []byte("world")}},
+			[]TagValue{{value: []byte("2")},
+				{tag: Tag(1), value: []byte("hello")},
+				{tag: Tag(1), value: []byte("world")}},
 			[][]TagValue{
 				{TagValue{tag: Tag(1), value: []byte("hello")}},
 				{TagValue{tag: Tag(1), value: []byte("world")}},
 			}},
 		{multiFieldTemplate,
 			[]TagValue{
-				TagValue{value: []byte("2")},
-				TagValue{tag: Tag(1), value: []byte("hello")},
-				TagValue{tag: Tag(1), value: []byte("goodbye")}, TagValue{tag: Tag(2), value: []byte("cruel")}, TagValue{tag: Tag(3), value: []byte("world")},
+				{value: []byte("2")},
+				{tag: Tag(1), value: []byte("hello")},
+				{tag: Tag(1), value: []byte("goodbye")}, {tag: Tag(2), value: []byte("cruel")}, {tag: Tag(3), value: []byte("world")},
 			},
 			[][]TagValue{
 				{TagValue{tag: Tag(1), value: []byte("hello")}},
@@ -158,10 +158,10 @@ func TestRepeatingGroup_Read(t *testing.T) {
 			}},
 		{multiFieldTemplate,
 			[]TagValue{
-				TagValue{value: []byte("3")},
-				TagValue{tag: Tag(1), value: []byte("hello")},
-				TagValue{tag: Tag(1), value: []byte("goodbye")}, TagValue{tag: Tag(2), value: []byte("cruel")}, TagValue{tag: Tag(3), value: []byte("world")},
-				TagValue{tag: Tag(1), value: []byte("another")},
+				{value: []byte("3")},
+				{tag: Tag(1), value: []byte("hello")},
+				{tag: Tag(1), value: []byte("goodbye")}, {tag: Tag(2), value: []byte("cruel")}, {tag: Tag(3), value: []byte("world")},
+				{tag: Tag(1), value: []byte("another")},
 			},
 			[][]TagValue{
 				{TagValue{tag: Tag(1), value: []byte("hello")}},
@@ -200,11 +200,11 @@ func TestRepeatingGroup_ReadRecursive(t *testing.T) {
 
 	f := NewRepeatingGroup(Tag(1), parentTemplate)
 	_, err := f.Read([]TagValue{
-		TagValue{value: []byte("2")},
-		TagValue{tag: Tag(2), value: []byte("hello")},
-		TagValue{tag: 3, value: []byte("1")}, TagValue{tag: 4, value: []byte("foo")},
-		TagValue{tag: Tag(2), value: []byte("world")},
-		TagValue{tag: 3, value: []byte("2")}, TagValue{tag: 4, value: []byte("foo")}, TagValue{tag: 4, value: []byte("bar")}, TagValue{tag: 5, value: []byte("fubar")},
+		{value: []byte("2")},
+		{tag: Tag(2), value: []byte("hello")},
+		{tag: 3, value: []byte("1")}, {tag: 4, value: []byte("foo")},
+		{tag: Tag(2), value: []byte("world")},
+		{tag: 3, value: []byte("2")}, {tag: 4, value: []byte("foo")}, {tag: 4, value: []byte("bar")}, {tag: 5, value: []byte("fubar")},
 	})
 	require.Nil(t, err)
 
diff --git a/validation.go b/validation.go
index 6e28b8cd029ac1cb262b7d9ed6d494e96388e8f0..dc17abc58da1c7667bb014d3e7152072e6326327 100644
--- a/validation.go
+++ b/validation.go
@@ -10,15 +10,14 @@ type validator interface {
 
 type validatorSettings struct {
 	CheckFieldsOutOfOrder bool
-	RejectInvalidMessage bool
-
+	RejectInvalidMessage  bool
 }
 
 //Default configuration for message validation.
 //See http://www.quickfixengine.org/quickfix/doc/html/configuration.html.
 var defaultValidatorSettings = validatorSettings{
 	CheckFieldsOutOfOrder: true,
-	RejectInvalidMessage: true,
+	RejectInvalidMessage:  true,
 }
 
 type fixValidator struct {
@@ -87,8 +86,6 @@ func validateFIX(d *datadictionary.DataDictionary, settings validatorSettings, m
 		}
 	}
 
-
-
 	return nil
 }
 
diff --git a/validation_test.go b/validation_test.go
index 7e5a7a3bc013d485c0c8eacb21cdba1ce23fd81d..10a8a7e3f483641d172199df5c5efd6a73f4011d 100644
--- a/validation_test.go
+++ b/validation_test.go
@@ -413,7 +413,7 @@ func tcInvalidTagCheckEnabled() validateTest {
 		Validator:         validator,
 		MessageBytes:      msgBytes,
 		DoNotExpectReject: false,
-		ExpectedRefTagID: &tag,
+		ExpectedRefTagID:  &tag,
 	}
 }