diff --git a/cdrc/csv_it_test.go b/cdrc/csv_it_test.go
index 51919ff56..2e040aa41 100644
--- a/cdrc/csv_it_test.go
+++ b/cdrc/csv_it_test.go
@@ -30,10 +30,10 @@ import (
 	"testing"
 	"time"
 
+	v1 "github.com/cgrates/cgrates/apier/v1"
 	"github.com/cgrates/cgrates/config"
 	"github.com/cgrates/cgrates/engine"
 	"github.com/cgrates/cgrates/utils"
-	v1 "github.com/cgrates/cgrates/apier/v1"
 )
 
 /*
diff --git a/cmd/cgr-engine/engine_test.go b/cmd/cgr-engine/engine_test.go
index 7b6a9fc6a..9598611ca 100644
--- a/cmd/cgr-engine/engine_test.go
+++ b/cmd/cgr-engine/engine_test.go
@@ -18,9 +18,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>
 package main
 
 import (
+	"github.com/cgrates/cgrates/utils"
 	"net/rpc"
 	"testing"
-	"github.com/cgrates/cgrates/utils"
 )
 
 func BenchmarkRPCGet(b *testing.B) {
diff --git a/engine/attributes_test.go b/engine/attributes_test.go
index cfe944faa..db775429b 100644
--- a/engine/attributes_test.go
+++ b/engine/attributes_test.go
@@ -152,7 +152,8 @@ func TestAttributePopulateAttrService(t *testing.T) {
 	//Need clone because time.Now adds extra information that DeepEqual doesn't like
 	if err := utils.Clone(expTimeAttributes, &cloneExpTimeAttributes); err != nil {
 		t.Error(err)
-	data:= NewInternalDB(nil,nil)
+	}
+	data := NewInternalDB(nil, nil)
 	dmAtr = NewDataManager(data, config.CgrConfig().CacheCfg(), nil, nil)
 	defaultCfg, err := config.NewDefaultCGRConfig()
 	defaultCfg.AttributeSCfg().ProcessRuns = 1
@@ -1699,7 +1700,7 @@ func TestAttributeProcessEventValueExponent(t *testing.T) {
 }
 
 func BenchmarkAttributeProcessEventConstant(b *testing.B) {
-	data:= NewInternalDB(nil, nil)
+	data := NewInternalDB(nil, nil)
 	dmAtr = NewDataManager(data, config.CgrConfig().CacheCfg(), nil, nil)
 	defaultCfg, err := config.NewDefaultCGRConfig()
 	defaultCfg.AttributeSCfg().ProcessRuns = 1
@@ -1763,7 +1764,7 @@ func BenchmarkAttributeProcessEventConstant(b *testing.B) {
 }
 
 func BenchmarkAttributeProcessEventVariable(b *testing.B) {
-	data:= NewInternalDB(nil, nil)
+	data := NewInternalDB(nil, nil)
 	dmAtr = NewDataManager(data, config.CgrConfig().CacheCfg(), nil, nil)
 	defaultCfg, err := config.NewDefaultCGRConfig()
 	defaultCfg.AttributeSCfg().ProcessRuns = 1
diff --git a/engine/calldesc.go b/engine/calldesc.go
index 0ac916048..3ea08f79e 100644
--- a/engine/calldesc.go
+++ b/engine/calldesc.go
@@ -47,7 +47,7 @@ func init() {
 			cgrCfg, _ = config.NewDefaultCGRConfig()
 			config.SetCgrConfig(cgrCfg)
 		}
-		data= NewInternalDB(nil, nil)
+		data = NewInternalDB(nil, nil)
 	}
 	dm = NewDataManager(data, config.CgrConfig().CacheCfg(), nil, nil)
 }