diff --git a/accounts/accounts_test.go b/accounts/accounts_test.go
index 7dda93a90..b2d0e763d 100644
--- a/accounts/accounts_test.go
+++ b/accounts/accounts_test.go
@@ -2465,7 +2465,7 @@ func TestDebitAbstractsMaxDebitAbstractFromConcreteNoConcrBal(t *testing.T) {
 		Tenant: "cgrates.org",
 		ID:     "TestV1DebitAbstractsWithRecurrentFeeNegative",
 		Balances: map[string]*utils.Balance{
-			"ab1": &utils.Balance{
+			"ab1": {
 				ID:    "ab1",
 				Type:  utils.MetaAbstract,
 				Units: utils.NewDecimal(int64(60*time.Second), 0),
diff --git a/apis/accounts_it_test.go b/apis/accounts_it_test.go
index d9562b38d..7be671fae 100644
--- a/apis/accounts_it_test.go
+++ b/apis/accounts_it_test.go
@@ -977,7 +977,7 @@ func testAccDebitAbstracts(t *testing.T) {
 			},
 		},
 		Accounting: map[string]*utils.AccountCharge{
-			"charge1": &utils.AccountCharge{
+			"charge1": {
 				AccountID:       "TEST_ACC_IT_TEST5",
 				BalanceID:       "AbstractBalance1",
 				Units:           utils.NewDecimal(int64(27*time.Second), 0),
@@ -1155,7 +1155,7 @@ func testAccMaxConcretes(t *testing.T) {
 			},
 		},
 		Accounting: map[string]*utils.AccountCharge{
-			accKEy: &utils.AccountCharge{
+			accKEy: {
 				AccountID:    "TEST_ACC_IT_TEST6",
 				BalanceID:    "ConcreteBalance2",
 				Units:        utils.NewDecimal(213, 0),
@@ -1315,7 +1315,7 @@ func testAccDebitConcretes(t *testing.T) {
 			},
 		},
 		Accounting: map[string]*utils.AccountCharge{
-			accKEy: &utils.AccountCharge{
+			accKEy: {
 				AccountID:    "TEST_ACC_IT_TEST7",
 				BalanceID:    "ConcreteBalance2",
 				Units:        utils.NewDecimal(213, 0),
diff --git a/console/command.go b/console/command.go
index ad84151c6..6ee2310cb 100644
--- a/console/command.go
+++ b/console/command.go
@@ -49,7 +49,7 @@ func GetCommands() map[string]Commander {
 
 func getAvailabelCommandsErr() error {
 	var keys []string
-	for key, _ := range commands {
+	for key := range commands {
 		keys = append(keys, key)
 	}
 	return fmt.Errorf("\n\tAvailable commands <%s>\n", strings.Join(keys, "|"))
diff --git a/engine/model_helpers_test.go b/engine/model_helpers_test.go
index 9da50bc00..33855de80 100644
--- a/engine/model_helpers_test.go
+++ b/engine/model_helpers_test.go
@@ -3281,7 +3281,7 @@ func TestRouteProfileToAPICase1(t *testing.T) {
 		FilterIDs:         []string{"FilterID1", "FilterID2", "*ai:~*req.AnswerTime:2020-04-11T21:34:01Z|2020-04-12T21:34:01Z"},
 		SortingParameters: []string{"Param1", "Param2"},
 		Routes: []*Route{
-			&Route{ID: "ResGroup2"},
+			{ID: "ResGroup2"},
 		},
 	}
 
@@ -3782,7 +3782,7 @@ func TestActionProfileMdlsAsTPActionProfile(t *testing.T) {
 			Blockers:  ";false",
 			Schedule:  "test_schedule",
 			Targets: []*utils.TPActionTarget{
-				&utils.TPActionTarget{
+				{
 					TargetType: utils.MetaAccounts,
 					TargetIDs:  []string{"test_account_id1", "test_account_id2"},
 				},
@@ -3863,11 +3863,11 @@ func TestModelHelpersAPItoActionProfile(t *testing.T) {
 		Weights:   ";1",
 		Schedule:  "test_schedule",
 		Targets: []*utils.TPActionTarget{
-			&utils.TPActionTarget{
+			{
 				TargetType: utils.MetaAccounts,
 				TargetIDs:  []string{"test_account_id1", "test_account_id2"},
 			},
-			&utils.TPActionTarget{
+			{
 				TargetType: utils.MetaResources,
 				TargetIDs:  []string{"test_ID1", "test_ID2"},
 			},
diff --git a/migrator/attributes_test.go b/migrator/attributes_test.go
index 22a9a1a7c..dd725d0ca 100644
--- a/migrator/attributes_test.go
+++ b/migrator/attributes_test.go
@@ -58,7 +58,7 @@ func TestV1AttributeProfileAsAttributeProfile(t *testing.T) {
 			ExpiryTime:     cloneExpTime,
 		},
 		Attributes: []*v2Attribute{
-			&v2Attribute{
+			{
 				FieldName:  "FL1",
 				Initial:    "In1",
 				Substitute: config.NewRSRParsersMustCompile("Al1", utils.InfieldSep),
@@ -86,7 +86,7 @@ func TestV2AttributeProfileAsAttributeProfile(t *testing.T) {
 			ExpiryTime:     cloneExpTime,
 		},
 		Attributes: []*v2Attribute{
-			&v2Attribute{
+			{
 				FieldName:  "FL1",
 				Initial:    "In1",
 				Substitute: config.NewRSRParsersMustCompile("Al1", utils.InfieldSep),
@@ -105,7 +105,7 @@ func TestV2AttributeProfileAsAttributeProfile(t *testing.T) {
 			ExpiryTime:     cloneExpTime,
 		},
 		Attributes: []*v3Attribute{
-			&v3Attribute{
+			{
 				FilterIDs:  []string{"*string:FL1:In1"},
 				FieldName:  "FL1",
 				Substitute: config.NewRSRParsersMustCompile("Al1", utils.InfieldSep),
@@ -132,7 +132,7 @@ func TestV2AttributeProfileAsAttributeProfile2(t *testing.T) {
 			ExpiryTime:     cloneExpTime,
 		},
 		Attributes: []*v2Attribute{
-			&v2Attribute{
+			{
 				FieldName:  "FL1",
 				Initial:    nil,
 				Substitute: config.NewRSRParsersMustCompile("Al1", utils.InfieldSep),
@@ -151,7 +151,7 @@ func TestV2AttributeProfileAsAttributeProfile2(t *testing.T) {
 			ExpiryTime:     cloneExpTime,
 		},
 		Attributes: []*v3Attribute{
-			&v3Attribute{
+			{
 				FilterIDs:  []string{"*string:FL1:"},
 				FieldName:  "FL1",
 				Substitute: config.NewRSRParsersMustCompile("Al1", utils.InfieldSep),
@@ -178,7 +178,7 @@ func TestV3AttributeProfileAsAttributeProfile(t *testing.T) {
 			ExpiryTime:     cloneExpTime,
 		},
 		Attributes: []*v3Attribute{
-			&v3Attribute{
+			{
 				FilterIDs:  []string{"*string:FL1:In1"},
 				FieldName:  "FL1",
 				Substitute: config.NewRSRParsersMustCompile("Al1", utils.InfieldSep),
@@ -196,7 +196,7 @@ func TestV3AttributeProfileAsAttributeProfile(t *testing.T) {
 			ExpiryTime:     cloneExpTime,
 		},
 		Attributes: []*v4Attribute{
-			&v4Attribute{
+			{
 				FilterIDs: []string{"*string:FL1:In1"},
 				FieldName: "FL1",
 				Type:      utils.MetaVariable,
@@ -224,7 +224,7 @@ func TestV4AttributeProfileAsAttributeProfile(t *testing.T) {
 			ExpiryTime:     cloneExpTime,
 		},
 		Attributes: []*v4Attribute{
-			&v4Attribute{
+			{
 				FieldName: "FL1",
 				Type:      utils.MetaVariable,
 				Value:     config.NewRSRParsersMustCompile("~Category:s/(.*)/${1}_UK_Mobile_Vodafone_GBRVF/", utils.InfieldSep),
@@ -238,7 +238,7 @@ func TestV4AttributeProfileAsAttributeProfile(t *testing.T) {
 		Contexts:  []string{utils.MetaSessionS},
 		FilterIDs: []string{"filter1"},
 		Attributes: []*v6Attribute{
-			&v6Attribute{
+			{
 				Path:  utils.MetaReq + utils.NestingSep + "FL1",
 				Type:  utils.MetaVariable,
 				Value: config.NewRSRParsersMustCompile("~*req.Category:s/(.*)/${1}_UK_Mobile_Vodafone_GBRVF/", utils.InfieldSep),
@@ -289,7 +289,7 @@ func TestAsAttributeProfileV2(t *testing.T) {
 			ExpiryTime:     time.Date(2020, 4, 18, 14, 25, 0, 0, time.UTC),
 		},
 		Attributes: []*v2Attribute{
-			&v2Attribute{
+			{
 				FieldName:  "FL1",
 				Initial:    "In1",
 				Substitute: sbstPrsr,
@@ -318,7 +318,7 @@ func TestAsAttributeProfileV3(t *testing.T) {
 			ExpiryTime:     time.Date(2020, 4, 18, 14, 25, 0, 0, time.UTC),
 		},
 		Attributes: []*v2Attribute{
-			&v2Attribute{
+			{
 				FieldName:  "FL1",
 				Initial:    "In1",
 				Substitute: config.NewRSRParsersMustCompile("Al1", utils.InfieldSep),
@@ -337,7 +337,7 @@ func TestAsAttributeProfileV3(t *testing.T) {
 			ExpiryTime:     time.Date(2020, 4, 18, 14, 25, 0, 0, time.UTC),
 		},
 		Attributes: []*v3Attribute{
-			&v3Attribute{
+			{
 				FilterIDs:  []string{"*string:FL1:In1"}, //here
 				FieldName:  "FL1",
 				Substitute: config.NewRSRParsersMustCompile("Al1", utils.InfieldSep),
@@ -362,7 +362,7 @@ func TestAsAttributeProfileV4(t *testing.T) {
 			ExpiryTime:     time.Date(2020, 4, 18, 14, 25, 0, 0, time.UTC),
 		},
 		Attributes: []*v3Attribute{
-			&v3Attribute{
+			{
 				FilterIDs:  []string{"*string:FL1:In1"},
 				FieldName:  "FL1",
 				Substitute: config.NewRSRParsersMustCompile("Al1", utils.InfieldSep),
@@ -380,7 +380,7 @@ func TestAsAttributeProfileV4(t *testing.T) {
 			ExpiryTime:     time.Date(2020, 4, 18, 14, 25, 0, 0, time.UTC),
 		},
 		Attributes: []*v4Attribute{
-			&v4Attribute{
+			{
 				FilterIDs: []string{"*string:FL1:In1"},
 				FieldName: "FL1",
 				Type:      utils.MetaVariable,
@@ -409,7 +409,7 @@ func TestAsAttributeProfileV5(t *testing.T) {
 			ExpiryTime:     time.Date(2020, 4, 18, 14, 25, 0, 0, time.UTC),
 		},
 		Attributes: []*v4Attribute{
-			&v4Attribute{
+			{
 				FilterIDs: []string{"*string:FL1:In1"},
 				FieldName: "FL1",
 				Type:      utils.MetaVariable,
@@ -425,7 +425,7 @@ func TestAsAttributeProfileV5(t *testing.T) {
 		Contexts:  []string{utils.MetaSessionS},
 		FilterIDs: []string{"filter1"},
 		Attributes: []*v6Attribute{
-			&v6Attribute{
+			{
 				FilterIDs: []string{"*string:FL1:In1"},
 				Path:      utils.MetaReq + utils.NestingSep + "FL1",
 				Type:      utils.MetaVariable,
@@ -478,7 +478,7 @@ func TestAsAttributeProfileV1To4(t *testing.T) {
 			ExpiryTime:     time.Date(2020, 4, 18, 14, 25, 0, 0, time.UTC),
 		},
 		Attributes: []*v4Attribute{
-			&v4Attribute{
+			{
 				FieldName: "FL1",
 				Type:      utils.MetaVariable,
 				Value:     sbstPrsr,
diff --git a/sessions/sessionscover_test.go b/sessions/sessionscover_test.go
index 926ae62df..0deba1cbe 100644
--- a/sessions/sessionscover_test.go
+++ b/sessions/sessionscover_test.go
@@ -4492,7 +4492,7 @@ func TestBiRPCv1DisconnectPeer(t *testing.T) {
 	sessions := NewSessionS(cfg, dm, nil, nil)
 
 	sessions.biJIDs = map[string]*biJClient{
-		"client1": &biJClient{
+		"client1": {
 			conn: client,
 		},
 	}