diff --git a/src/main/java/com/googlesource/gerrit/plugins/imagare/ImageServlet.java b/src/main/java/com/googlesource/gerrit/plugins/imagare/ImageServlet.java
index 5131f1c..768ca3e 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/imagare/ImageServlet.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/imagare/ImageServlet.java
@@ -230,9 +230,8 @@
       if (ifModifiedSince > 0 && ifModifiedSince == lastModified) {
         res.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
         return;
-      } else {
-        res.setDateHeader("Last-Modified", lastModified);
       }
+      res.setDateHeader("Last-Modified", lastModified);
     }
     res.setContentType(contentType);
     res.setCharacterEncoding(UTF_8.name());
diff --git a/src/main/java/com/googlesource/gerrit/plugins/imagare/ImagesCollection.java b/src/main/java/com/googlesource/gerrit/plugins/imagare/ImagesCollection.java
index 6c51520..c810abb 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/imagare/ImagesCollection.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/imagare/ImagesCollection.java
@@ -50,9 +50,8 @@
         parent.getControl().controlForRef(new Branch.NameKey(parent.getNameKey(), id.get()));
     if (refControl.canRead()) {
       return new ImageResource(refControl);
-    } else {
-      throw new ResourceNotFoundException(id);
     }
+    throw new ResourceNotFoundException(id);
   }
 
   @Override
diff --git a/src/main/java/com/googlesource/gerrit/plugins/imagare/PostImage.java b/src/main/java/com/googlesource/gerrit/plugins/imagare/PostImage.java
index 9f9f39e..6b7cffc 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/imagare/PostImage.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/imagare/PostImage.java
@@ -140,12 +140,10 @@
           throw new BadRequestException("incorrect mime type");
         }
         return new ImageInfo(storeImage(pc, content, fileName));
-      } else {
-        throw new MethodNotAllowedException("unsupported encoding");
       }
-    } else {
-      throw new BadRequestException("invalid image data");
+      throw new MethodNotAllowedException("unsupported encoding");
     }
+    throw new BadRequestException("invalid image data");
   }
 
   private String storeImage(ProjectControl pc, byte[] content, String fileName)
diff --git a/src/main/java/com/googlesource/gerrit/plugins/imagare/client/ImageUploadScreen.java b/src/main/java/com/googlesource/gerrit/plugins/imagare/client/ImageUploadScreen.java
index 1176a79..a146a2e 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/imagare/client/ImageUploadScreen.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/imagare/client/ImageUploadScreen.java
@@ -108,9 +108,8 @@
     List<String> values = getParameters().get(name);
     if (values == null) {
       return null;
-    } else {
-      return values.get(values.size() - 1);
     }
+    return values.get(values.size() - 1);
   }
 
   private static Map<String, List<String>> getParameters() {