diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadLayout.java
index 3fb735284..7376cce13 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadLayout.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadLayout.java
@@ -222,10 +222,7 @@ public class UploadLayout extends VerticalLayout {
         }
 
         private boolean isDirectory(final Html5File file) {
-            if (Strings.isNullOrEmpty(file.getType()) && file.getFileSize() % 4096 == 0) {
-                return true;
-            }
-            return false;
+            return Strings.isNullOrEmpty(file.getType()) && file.getFileSize() % 4096 == 0;
         }
     }
 
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/BulkUploadHandler.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/BulkUploadHandler.java
index d52537a92..2369893c7 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/BulkUploadHandler.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/BulkUploadHandler.java
@@ -306,11 +306,10 @@ public class BulkUploadHandler extends CustomComponent
             final DistributionSetIdName dsSelected = (DistributionSetIdName) comboBox.getValue();
             if (distributionSetManagement.findDistributionSetById(dsSelected.getId()) == null) {
                 return i18n.get("message.bulk.upload.assignment.failed");
-            } else {
-                deploymentManagement.assignDistributionSet(targetBulkUpload.getDsNameAndVersion().getId(), actionType,
-                        forcedTimeStamp, targetsList.toArray(new String[targetsList.size()]));
-                return null;
             }
+            deploymentManagement.assignDistributionSet(targetBulkUpload.getDsNameAndVersion().getId(), actionType,
+                    forcedTimeStamp, targetsList.toArray(new String[targetsList.size()]));
+            return null;
         }
 
         private String tagAssignment() {
@@ -330,9 +329,8 @@ public class BulkUploadHandler extends CustomComponent
             }
             if (deletedTags.size() == 1) {
                 return i18n.get("message.bulk.upload.tag.assignment.failed", deletedTags.get(0));
-            } else {
-                return i18n.get("message.bulk.upload.tag.assignments.failed");
             }
+            return i18n.get("message.bulk.upload.tag.assignments.failed");
         }
 
         private boolean ifTagsSelected() {
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsListGrid.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsListGrid.java
index 0a1446169..fe17b3cba 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsListGrid.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsListGrid.java
@@ -248,13 +248,13 @@ public class RolloutGroupTargetsListGrid extends AbstractGrid {
             if (rolloutGroup != null && rolloutGroup.getStatus() == RolloutGroupStatus.READY) {
                 return HawkbitCommonUtil.getStatusLabelDetailsInString(
                         Integer.toString(FontAwesome.DOT_CIRCLE_O.getCodepoint()), "statusIconLightBlue", null);
-            } else if (rolloutGroup != null && rolloutGroup.getStatus() == RolloutGroupStatus.FINISHED) {
+            }
+            if (rolloutGroup != null && rolloutGroup.getStatus() == RolloutGroupStatus.FINISHED) {
                 return HawkbitCommonUtil.getStatusLabelDetailsInString(
                         Integer.toString(FontAwesome.MINUS_CIRCLE.getCodepoint()), "statusIconBlue", null);
-            } else {
-                return HawkbitCommonUtil.getStatusLabelDetailsInString(
-                        Integer.toString(FontAwesome.QUESTION_CIRCLE.getCodepoint()), "statusIconBlue", null);
             }
+            return HawkbitCommonUtil.getStatusLabelDetailsInString(
+                    Integer.toString(FontAwesome.QUESTION_CIRCLE.getCodepoint()), "statusIconBlue", null);
         }
 
     }