diff --git a/app/src/main/java/org/fdroid/fdroid/data/Apk.java b/app/src/main/java/org/fdroid/fdroid/data/Apk.java
index 98844f15b..1f6b92220 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/Apk.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/Apk.java
@@ -32,19 +32,25 @@ public class Apk extends ValueObject implements Comparable<Apk> {
 
     public Utils.CommaSeparatedList nativecode; // null if empty or unknown
 
-    // ID (md5 sum of public key) of signature. Might be null, in the
-    // transition to this field existing.
+    /**
+     * ID (md5 sum of public key) of signature. Might be null, in the
+     * transition to this field existing.
+     */
     public String sig;
 
-    // True if compatible with the device.
+    /**
+     * True if compatible with the device.
+     */
     public boolean compatible;
 
     public String apkName; // F-Droid style APK name
     public SanitizedFile installedFile; // the .apk file on this device's filesystem
 
-    // If not null, this is the name of the source tarball for the
-    // application. Null indicates that it's a developer's binary
-    // build - otherwise it's built from source.
+    /**
+     * If not null, this is the name of the source tarball for the
+     * application. Null indicates that it's a developer's binary
+     * build - otherwise it's built from source.
+     */
     public String srcname;
 
     public int repoVersion;
diff --git a/app/src/main/java/org/fdroid/fdroid/data/App.java b/app/src/main/java/org/fdroid/fdroid/data/App.java
index 2cb24a05c..9cb4b4463 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/App.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/App.java
@@ -37,7 +37,9 @@ public class App extends ValueObject implements Comparable<App> {
 
     private static final String TAG = "App";
 
-    // True if compatible with the device (i.e. if at least one apk is)
+    /**
+     * True if compatible with the device (i.e. if at least one apk is)
+     */
     public boolean compatible;
 
     public String packageName = "unknown";
@@ -84,27 +86,39 @@ public class App extends ValueObject implements Comparable<App> {
     public Date added;
     public Date lastUpdated;
 
-    // List of categories (as defined in the metadata
-    // documentation) or null if there aren't any.
+    /**
+     * List of categories (as defined in the metadata documentation) or null if there aren't any.
+     */
     public Utils.CommaSeparatedList categories;
 
-    // List of anti-features (as defined in the metadata
-    // documentation) or null if there aren't any.
+    /**
+     * List of anti-features (as defined in the metadata documentation) or null if there aren't any.
+     */
     public Utils.CommaSeparatedList antiFeatures;
 
-    // List of special requirements (such as root privileges) or
-    // null if there aren't any.
+    /**
+     * List of special requirements (such as root privileges) or null if there aren't any.
+     */
     public Utils.CommaSeparatedList requirements;
 
-    // True if all updates for this app are to be ignored
+    /**
+     * True if all updates for this app are to be ignored
+     */
     public boolean ignoreAllUpdates;
 
-    // True if the current update for this app is to be ignored
+    /**
+     * True if the current update for this app is to be ignored
+     */
     public int ignoreThisUpdate;
 
-    // To be displayed at 48dp (x1.0)
+    /**
+     * To be displayed at 48dp (x1.0)
+     */
     public String iconUrl;
-    // To be displayed at 72dp (x1.5)
+
+    /**
+     * To be displayed at 72dp (x1.5)
+     */
     public String iconUrlLarge;
 
     public String installedVersionName;
@@ -476,16 +490,20 @@ public class App extends ValueObject implements Comparable<App> {
         return updates;
     }
 
-    // True if there are new versions (apks) available and the user wants
-    // to be notified about them
+    /**
+     * True if there are new versions (apks) available and the user wants
+     * to be notified about them
+     */
     public boolean canAndWantToUpdate() {
         boolean canUpdate = hasUpdates();
         boolean wantsUpdate = !ignoreAllUpdates && ignoreThisUpdate < suggestedVersionCode;
         return canUpdate && wantsUpdate && !isFiltered();
     }
 
-    // Whether the app is filtered or not based on AntiFeatures and root
-    // permission (set in the Settings page)
+    /**
+     * Whether the app is filtered or not based on AntiFeatures and root
+     * permission (set in the Settings page)
+     */
     public boolean isFiltered() {
         return new AppFilter().filter(this);
     }
diff --git a/app/src/main/java/org/fdroid/fdroid/data/Repo.java b/app/src/main/java/org/fdroid/fdroid/data/Repo.java
index 481ce9045..df8f7ef4e 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/Repo.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/Repo.java
@@ -121,8 +121,10 @@ public class Repo extends ValueObject {
         return !TextUtils.isEmpty(this.signingCertificate);
     }
 
-    // this happens when a repo is configed with a fingerprint, but the client
-    // has not connected to it yet to download its signing certificate
+    /**
+     * This happens when a repo is configed with a fingerprint, but the client
+     * has not connected to it yet to download its signing certificate
+     */
     public boolean isSignedButUnverified() {
         return TextUtils.isEmpty(this.signingCertificate) && !TextUtils.isEmpty(this.fingerprint);
     }