diff --git a/OutOfSchool/OutOfSchool.WebApi.Tests/Controllers/ApplicationControllerTests.cs b/OutOfSchool/OutOfSchool.WebApi.Tests/Controllers/ApplicationControllerTests.cs
index 3be519d0a2..5cbfdfb4a5 100644
--- a/OutOfSchool/OutOfSchool.WebApi.Tests/Controllers/ApplicationControllerTests.cs
+++ b/OutOfSchool/OutOfSchool.WebApi.Tests/Controllers/ApplicationControllerTests.cs
@@ -758,7 +758,7 @@ private List<WorkshopCard> FakeWorkshopCards()
             return eSlist;
         }
 
-        private WorkshopDescriptionItemDto FakeWorkshopDescriptionItem ()
+        private WorkshopDescriptionItemDto FakeWorkshopDescriptionItem()
         {
             var id = Guid.NewGuid();
             return new WorkshopDescriptionItemDto
diff --git a/OutOfSchool/OutOfSchool.WebApi.Tests/Controllers/WorkshopControllerTests.cs b/OutOfSchool/OutOfSchool.WebApi.Tests/Controllers/WorkshopControllerTests.cs
index 3aedb3cfe6..d8ebe37df6 100644
--- a/OutOfSchool/OutOfSchool.WebApi.Tests/Controllers/WorkshopControllerTests.cs
+++ b/OutOfSchool/OutOfSchool.WebApi.Tests/Controllers/WorkshopControllerTests.cs
@@ -636,7 +636,7 @@ private List<WorkshopCard> FakeWorkshopCards()
             return eSlist;
         }
 
-        private WorkshopDescriptionItemDto FakeWorkshopDescriptionItem ()
+        private WorkshopDescriptionItemDto FakeWorkshopDescriptionItem()
         {
             var id = Guid.NewGuid();
             return new WorkshopDescriptionItemDto
diff --git a/OutOfSchool/OutOfSchool.WebApi.Tests/Services/Database/WorkshopServiceTests.cs b/OutOfSchool/OutOfSchool.WebApi.Tests/Services/Database/WorkshopServiceTests.cs
index 833ece65df..d5ed487f02 100644
--- a/OutOfSchool/OutOfSchool.WebApi.Tests/Services/Database/WorkshopServiceTests.cs
+++ b/OutOfSchool/OutOfSchool.WebApi.Tests/Services/Database/WorkshopServiceTests.cs
@@ -460,7 +460,6 @@ private Workshop WithWorkshop(Guid id)
                 Id = id,
                 Title = "ChangedTitle",
                 Phone = "1111111111",
-                //Description = "Desc1",
                 Price = 1000,
                 WithDisabilityOptions = true,
                 ProviderTitle = "ProviderTitle",
diff --git a/OutOfSchool/OutOfSchool.WebApi/Extensions/ElasticsearchMappingExtensions.cs b/OutOfSchool/OutOfSchool.WebApi/Extensions/ElasticsearchMappingExtensions.cs
index 65dca9a4fb..114d6b9c9c 100644
--- a/OutOfSchool/OutOfSchool.WebApi/Extensions/ElasticsearchMappingExtensions.cs
+++ b/OutOfSchool/OutOfSchool.WebApi/Extensions/ElasticsearchMappingExtensions.cs
@@ -11,7 +11,7 @@ namespace OutOfSchool.WebApi.Extensions
     // TODO: create a mapping profile instead of extensions
     public static class ElasticsearchMappingExtensions
     {
-        const char SEPARATOR = '¤';
+        private const char SEPARATOR = '¤';
 
         // From DTO to ES models
         public static WorkshopES ToESModel(this WorkshopDTO workshopDto)
diff --git a/OutOfSchool/OutOfSchool.WebApi/Util/CustomValidation/CollectionValidator.cs b/OutOfSchool/OutOfSchool.WebApi/Util/CustomValidation/CollectionNotEmptyAttribute.cs
similarity index 81%
rename from OutOfSchool/OutOfSchool.WebApi/Util/CustomValidation/CollectionValidator.cs
rename to OutOfSchool/OutOfSchool.WebApi/Util/CustomValidation/CollectionNotEmptyAttribute.cs
index 26769d0a02..b982112709 100644
--- a/OutOfSchool/OutOfSchool.WebApi/Util/CustomValidation/CollectionValidator.cs
+++ b/OutOfSchool/OutOfSchool.WebApi/Util/CustomValidation/CollectionNotEmptyAttribute.cs
@@ -4,7 +4,7 @@
 namespace OutOfSchool.WebApi.Util.CustomValidation
 {
     [AttributeUsage(AttributeTargets.Property)]
-    public class CollectionNotEmpty : System.ComponentModel.DataAnnotations.ValidationAttribute
+    public class CollectionNotEmptyAttribute : System.ComponentModel.DataAnnotations.ValidationAttribute
     {
         public override bool IsValid(object value)
         {