diff --git a/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/DatasetService.java b/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/DatasetService.java
index 990bd54..ea1fe96 100644
--- a/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/DatasetService.java
+++ b/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/DatasetService.java
@@ -9,7 +9,6 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.data.domain.Page;
 
-
 @Service
 public class DatasetService {
     private dataRepository datasetRepository;
@@ -91,20 +90,22 @@ public class DatasetService {
     public Page<Dataset> getDatasetsByOptionalCriteria(String title, String description, String author, String abst,
             Type type, Float raiting, Category category, Pageable pageable) {
         return datasetRepository.findByOptionalCriteria(Optional.ofNullable(title), Optional.ofNullable(description),
-                Optional.ofNullable(author), Optional.ofNullable(abst), Optional.ofNullable(type), Optional.ofNullable(category),
+                Optional.ofNullable(author), Optional.ofNullable(abst), Optional.ofNullable(type),
+                Optional.ofNullable(category),
                 Optional.ofNullable(raiting), pageable);
     }
 
     public Page<Dataset> searchByOptionalCriteria(String search, String categories, String type, Pageable pageable) {
-        //TODO: make it not Crash
-        //TODO: make it do useful stuff
-        Category category = categories.equals("%") ? null : categoryRepository.getCategoryById(UUID.fromString(categories)) ;
+        Category category = categories.equals("%") ? null
+                : categoryRepository.getCategoryById(UUID.fromString(categories));
         Type t = type.equals("%") ? null : Type.valueOf(type);
 
-        if(category == null){
-            return datasetRepository.searchByOptionalCriteria(Optional.ofNullable(search), Optional.ofNullable(t),pageable);
+        if (category == null) {
+            return datasetRepository.searchByOptionalCriteria(Optional.ofNullable(search), Optional.ofNullable(t),
+                    pageable);
         }
-        return datasetRepository.searchByOptionalCriteriaWithCategory(Optional.ofNullable(search), category, Optional.ofNullable(t),pageable);
+        return datasetRepository.searchByOptionalCriteriaWithCategory(Optional.ofNullable(search), category,
+                Optional.ofNullable(t), pageable);
     }
 
 }
\ No newline at end of file