diff --git a/WebAPI/dataImporters/morska.d1.importer.cs b/WebAPI/dataImporters/morska.d1.importer.cs
index 375efbe..bc45152 100644
--- a/WebAPI/dataImporters/morska.d1.importer.cs
+++ b/WebAPI/dataImporters/morska.d1.importer.cs
@@ -23,18 +23,18 @@ public class MorskaD1Importer(
         {
             throw new Exception($"SheetTabName not found, {importWorker.Name}");
         }
-        var importYearCell = importWorker.Records!.FirstOrDefault(x => x.Code == "ImportYear")?.Desc1;
-        if (importYearCell == null)
+        var year = importWorker.Records!.FirstOrDefault(x => x.Code == "ImportYear")?.Desc1;
+        if (year == null)
         {
             throw new Exception($"ImportYear not found, {importWorker.Name}");
         }
-        var importMonthCell = importWorker.Records!.FirstOrDefault(x => x.Code == "ImportMonth")?.Desc1;
-        if (importMonthCell == null)
+        var month = importWorker.Records!.FirstOrDefault(x => x.Code == "ImportMonth")?.Desc1;
+        if (month == null)
         {
             throw new Exception($"ImportMonth not found, {importWorker.Name}");
         }
-        var importNameCell = importWorker.Records!.FirstOrDefault(x => x.Code == "ImportName")?.Desc1;
-        if (importNameCell == null)
+        var name = importWorker.Records!.FirstOrDefault(x => x.Code == "ImportName")?.Desc1;
+        if (name == null)
         {
             throw new Exception($"ImportName not found, {importWorker.Name}");
         }
@@ -44,25 +44,7 @@ public class MorskaD1Importer(
         {
             throw new Exception($"DataRange not found, {importWorker.Name}");
         }
-
-        var nameResponse = googleSheetValues.Get(sheetId, $"{sheetTabName}!{importNameCell}:{importNameCell}").Execute();
-        var name = nameResponse.Values?[0][0].ToString();
-        if (name == null)
-        {
-            throw new Exception($"ImportName cell is empty, {importWorker.Name}");
-        }
-        var yearResponse = googleSheetValues.Get(sheetId, $"{sheetTabName}!{importYearCell}:{importYearCell}").Execute();
-        var year = yearResponse.Values[0][0].ToString();
-        if (year == null)
-        {
-            throw new Exception($"ImportYear cell is empty, {importWorker.Name}");
-        }
-        var monthResponse = googleSheetValues.Get(sheetId, $"{sheetTabName}!{importMonthCell}:{importMonthCell}").Execute();
-        var month = monthResponse.Values[0][0].ToString();
-        if (month == null)
-        {
-            throw new Exception($"ImportMonth cell is empty, {importWorker.Name}");
-        }
+        
         var layer = new Layer
         {
             Number = db.Layers.Count() + 1,
diff --git a/WebAPI/dataImporters/morska.fk2.importer.cs b/WebAPI/dataImporters/morska.fk2.importer.cs
index 6356e39..8ea13f9 100644
--- a/WebAPI/dataImporters/morska.fk2.importer.cs
+++ b/WebAPI/dataImporters/morska.fk2.importer.cs
@@ -6,22 +6,11 @@ using WebAPI.Models;
 
 namespace DiunaBIWebAPI.dataImporters;
 
-public class MorskaFk2Importer
+public class MorskaFk2Importer(
+    AppDbContext db,
+    SpreadsheetsResource.ValuesResource googleSheetValues,
+    LayersController controller)
 {
-    private readonly AppDbContext _db;
-    private readonly SpreadsheetsResource.ValuesResource _googleSheetValues;
-    private readonly LayersController _controller;
-
-    public MorskaFk2Importer(
-        AppDbContext db,
-        SpreadsheetsResource.ValuesResource googleSheetValues,
-        LayersController controller)
-    {
-        _db = db;
-        _googleSheetValues = googleSheetValues;
-        _controller = controller;
-    }
-
     public void Import(Layer importWorker)
     {
         var sheetId = importWorker.Records!.FirstOrDefault(x => x.Code == "SheetId")?.Desc1;
@@ -34,53 +23,31 @@ public class MorskaFk2Importer
         {
             throw new Exception($"SheetTabName not found, {importWorker.Name}");
         }
-        var importYearCell = importWorker.Records!.FirstOrDefault(x => x.Code == "ImportYear")?.Desc1;
-        if (importYearCell == null)
+        var year = importWorker.Records!.FirstOrDefault(x => x.Code == "ImportYear")?.Desc1;
+        if (year == null)
         {
             throw new Exception($"ImportYear not found, {importWorker.Name}");
         }
-        var importMonthCell = importWorker.Records!.FirstOrDefault(x => x.Code == "ImportMonth")?.Desc1;
-        if (importMonthCell == null)
+        var month = importWorker.Records!.FirstOrDefault(x => x.Code == "ImportMonth")?.Desc1;
+        if (month == null)
         {
             throw new Exception($"ImportMonth not found, {importWorker.Name}");
         }
-        var importNameCell = importWorker.Records!.FirstOrDefault(x => x.Code == "ImportName")?.Desc1;
-        if (importNameCell == null)
+        var name = importWorker.Records!.FirstOrDefault(x => x.Code == "ImportName")?.Desc1;
+        if (name == null)
         {
             throw new Exception($"ImportName not found, {importWorker.Name}");
         }
-        var checkSumCell = importWorker.Records!.FirstOrDefault(x => x.Code == "SheetId")?.Desc1;
-        if (checkSumCell == null)
-        {
-            throw new Exception($"SheetId not found, {importWorker.Name}");
-        }
+
         var dataRange = importWorker.Records!.FirstOrDefault(x => x.Code == "DataRange")?.Desc1;
         if (dataRange == null)
         {
             throw new Exception($"DataRange not found, {importWorker.Name}");
         }
-
-        var nameResponse = _googleSheetValues.Get(sheetId, $"{sheetTabName}!{importNameCell}:{importNameCell}").Execute();
-        var name = nameResponse.Values?[0][0].ToString();
-        if (name == null)
-        {
-            throw new Exception($"ImportName cell is empty, {importWorker.Name}");
-        }
-        var yearResponse = _googleSheetValues.Get(sheetId, $"{sheetTabName}!{importYearCell}:{importYearCell}").Execute();
-        var year = yearResponse.Values[0][0].ToString();
-        if (year == null)
-        {
-            throw new Exception($"ImportYear cell is empty, {importWorker.Name}");
-        }
-        var monthResponse = _googleSheetValues.Get(sheetId, $"{sheetTabName}!{importMonthCell}:{importMonthCell}").Execute();
-        var month = monthResponse.Values[0][0].ToString();
-        if (month == null)
-        {
-            throw new Exception($"ImportMonth cell is empty, {importWorker.Name}");
-        }
+        
         var layer = new Layer
         {
-            Number = _db.Layers.Count() + 1,
+            Number = db.Layers.Count() + 1,
             ParentId = importWorker.Id,
             Type = LayerType.Import,
             CreatedById = Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D"),
@@ -88,11 +55,11 @@ public class MorskaFk2Importer
             CreatedAt = DateTime.UtcNow,
             ModifiedAt = DateTime.UtcNow
         };
-        layer.Name = $"L{layer.Number}-I-{name}2-{year}/{month}-{DateTime.Now.ToString("yyyyMMddHHmm", CultureInfo.InvariantCulture)}";
+        layer.Name = $"L{layer.Number}-I-{name}-{year}/{month}-{DateTime.Now.ToString("yyyyMMddHHmm", CultureInfo.InvariantCulture)}";
 
         var newRecords = new List<Record>();
 
-        var dataRangeResponse = _googleSheetValues.Get(sheetId, $"{sheetTabName}!{dataRange}").Execute();
+        var dataRangeResponse = googleSheetValues.Get(sheetId, $"{sheetTabName}!{dataRange}").Execute();
         var data = dataRangeResponse.Values;
         for (var i = 0; i < data.Count; i++)
         {
@@ -119,8 +86,8 @@ public class MorskaFk2Importer
             };
             newRecords.Add(record);
         }
-        _db.Layers.Add(layer);
-        _controller.SaveRecords(layer.Id, newRecords, Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D"));
-        _db.SaveChanges();
+        db.Layers.Add(layer);
+        controller.SaveRecords(layer.Id, newRecords, Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D"));
+        db.SaveChanges();
     }
 }
\ No newline at end of file
diff --git a/WebAPI/dataImporters/morska.importer.cs b/WebAPI/dataImporters/morska.importer.cs
index 70aa747..d358f7e 100644
--- a/WebAPI/dataImporters/morska.importer.cs
+++ b/WebAPI/dataImporters/morska.importer.cs
@@ -6,22 +6,11 @@ using WebAPI.Models;
 
 namespace DiunaBIWebAPI.dataImporters;
 
-public class MorskaImporter
+public class MorskaImporter(
+    AppDbContext db,
+    SpreadsheetsResource.ValuesResource googleSheetValues,
+    LayersController controller)
 {
-    private readonly AppDbContext _db;
-    private readonly SpreadsheetsResource.ValuesResource _googleSheetValues;
-    private readonly LayersController _controller;
-
-    public MorskaImporter(
-        AppDbContext db,
-        SpreadsheetsResource.ValuesResource googleSheetValues,
-        LayersController controller)
-    {
-        _db = db;
-        _googleSheetValues = googleSheetValues;
-        _controller = controller;
-    }
-
     public void Import(Layer importWorker)
     {
         var sheetId = importWorker.Records!.FirstOrDefault(x => x.Code == "SheetId")?.Desc1;
@@ -34,53 +23,31 @@ public class MorskaImporter
         {
             throw new Exception($"SheetTabName not found, {importWorker.Name}");
         }
-        var importYearCell = importWorker.Records!.FirstOrDefault(x => x.Code == "ImportYear")?.Desc1;
-        if (importYearCell == null)
+        var year = importWorker.Records!.FirstOrDefault(x => x.Code == "ImportYear")?.Desc1;
+        if (year == null)
         {
             throw new Exception($"ImportYear not found, {importWorker.Name}");
         }
-        var importMonthCell = importWorker.Records!.FirstOrDefault(x => x.Code == "ImportMonth")?.Desc1;
-        if (importMonthCell == null)
+        var month = importWorker.Records!.FirstOrDefault(x => x.Code == "ImportMonth")?.Desc1;
+        if (month == null)
         {
             throw new Exception($"ImportMonth not found, {importWorker.Name}");
         }
-        var importNameCell = importWorker.Records!.FirstOrDefault(x => x.Code == "ImportName")?.Desc1;
-        if (importNameCell == null)
+        var name = importWorker.Records!.FirstOrDefault(x => x.Code == "ImportName")?.Desc1;
+        if (name == null)
         {
             throw new Exception($"ImportName not found, {importWorker.Name}");
         }
-        var checkSumCell = importWorker.Records!.FirstOrDefault(x => x.Code == "SheetId")?.Desc1;
-        if (checkSumCell == null)
-        {
-            throw new Exception($"SheetId not found, {importWorker.Name}");
-        }
+
         var dataRange = importWorker.Records!.FirstOrDefault(x => x.Code == "DataRange")?.Desc1;
         if (dataRange == null)
         {
             throw new Exception($"DataRange not found, {importWorker.Name}");
         }
-
-        var nameResponse = _googleSheetValues.Get(sheetId, $"{sheetTabName}!{importNameCell}:{importNameCell}").Execute();
-        var name = nameResponse.Values?[0][0].ToString();
-        if (name == null)
-        {
-            throw new Exception($"ImportName cell is empty, {importWorker.Name}");
-        }
-        var yearResponse = _googleSheetValues.Get(sheetId, $"{sheetTabName}!{importYearCell}:{importYearCell}").Execute();
-        var year = yearResponse.Values[0][0].ToString();
-        if (year == null)
-        {
-            throw new Exception($"ImportYear cell is empty, {importWorker.Name}");
-        }
-        var monthResponse = _googleSheetValues.Get(sheetId, $"{sheetTabName}!{importMonthCell}:{importMonthCell}").Execute();
-        var month = monthResponse.Values[0][0].ToString();
-        if (month == null)
-        {
-            throw new Exception($"ImportMonth cell is empty, {importWorker.Name}");
-        }
+        
         var layer = new Layer
         {
-            Number = _db.Layers.Count() + 1,
+            Number = db.Layers.Count() + 1,
             ParentId = importWorker.Id,
             Type = LayerType.Import,
             CreatedById = Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D"),
@@ -92,7 +59,7 @@ public class MorskaImporter
 
         var newRecords = new List<Record>();
 
-        var dataRangeResponse = _googleSheetValues.Get(sheetId, $"{sheetTabName}!{dataRange}").Execute();
+        var dataRangeResponse = googleSheetValues.Get(sheetId, $"{sheetTabName}!{dataRange}").Execute();
         var data = dataRangeResponse.Values;
         for (var i = 0; i < data[1].Count; i++)
         {
@@ -108,8 +75,8 @@ public class MorskaImporter
             };
             newRecords.Add(record);
         }
-        _db.Layers.Add(layer);
-        _controller.SaveRecords(layer.Id, newRecords, Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D"));
-        _db.SaveChanges();
+        db.Layers.Add(layer);
+        controller.SaveRecords(layer.Id, newRecords, Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D"));
+        db.SaveChanges();
     }
 }
\ No newline at end of file