diff --git a/app/src/main/java/org/fdroid/fdroid/AppFilter.java b/app/src/main/java/org/fdroid/fdroid/AppFilter.java
index e139ae808..ee3397b02 100644
--- a/app/src/main/java/org/fdroid/fdroid/AppFilter.java
+++ b/app/src/main/java/org/fdroid/fdroid/AppFilter.java
@@ -29,12 +29,8 @@ public class AppFilter {
             return false;
         }
 
-        if (!Preferences.get().filterAppsRequiringRoot() &&
-                app.requirements.contains("root")) {
-            return true;
-        }
-
-        return false;
+        return !Preferences.get().filterAppsRequiringRoot()
+                && app.requirements.contains("root");
     }
 
 }
diff --git a/config/pmd/rules.xml b/config/pmd/rules.xml
index 414454615..242403a32 100644
--- a/config/pmd/rules.xml
+++ b/config/pmd/rules.xml
@@ -39,4 +39,8 @@
     <rule ref="rulesets/java/design.xml/IdempotentOperations"/>
     <rule ref="rulesets/java/design.xml/ImmutableField"/>
     <rule ref="rulesets/java/design.xml/SingularField"/>
+    <rule ref="rulesets/java/design.xml/SimplifyBooleanReturns"/>
+    <rule ref="rulesets/java/design.xml/SimplifyBooleanExpressions"/>
+    <rule ref="rulesets/java/design.xml/LogicInversion"/>
+
 </ruleset>