diff --git a/app/src/main/java/org/schabi/newpipe/about/LicenseFragment.java b/app/src/main/java/org/schabi/newpipe/about/LicenseFragment.java
index e869dbb14..a6e64616d 100644
--- a/app/src/main/java/org/schabi/newpipe/about/LicenseFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/about/LicenseFragment.java
@@ -19,6 +19,7 @@ import org.schabi.newpipe.util.ShareUtils;
 
 import java.io.Serializable;
 import java.util.Arrays;
+import java.util.Comparator;
 
 /**
  * Fragment containing the software licenses.
@@ -64,7 +65,7 @@ public class LicenseFragment extends Fragment {
             }
         }
         // Sort components by name
-        Arrays.sort(softwareComponents, (o1, o2) -> o1.getName().compareTo(o2.getName()));
+        Arrays.sort(softwareComponents, Comparator.comparing(SoftwareComponent::getName));
     }
 
     @Nullable
diff --git a/app/src/main/java/org/schabi/newpipe/database/playlist/PlaylistLocalItem.java b/app/src/main/java/org/schabi/newpipe/database/playlist/PlaylistLocalItem.java
index 3ce95631c..43dbd89ea 100644
--- a/app/src/main/java/org/schabi/newpipe/database/playlist/PlaylistLocalItem.java
+++ b/app/src/main/java/org/schabi/newpipe/database/playlist/PlaylistLocalItem.java
@@ -5,6 +5,7 @@ import org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 public interface PlaylistLocalItem extends LocalItem {
@@ -18,15 +19,8 @@ public interface PlaylistLocalItem extends LocalItem {
         items.addAll(localPlaylists);
         items.addAll(remotePlaylists);
 
-        Collections.sort(items, (left, right) -> {
-            final String on1 = left.getOrderingName();
-            final String on2 = right.getOrderingName();
-            if (on1 == null) {
-                return on2 == null ? 0 : 1;
-            } else {
-                return on2 == null ? -1 : on1.compareToIgnoreCase(on2);
-            }
-        });
+        Collections.sort(items, Comparator.comparing(PlaylistLocalItem::getOrderingName,
+                Comparator.nullsLast(String.CASE_INSENSITIVE_ORDER)));
 
         return items;
     }
diff --git a/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java
index 48a0e3430..b4398d873 100644
--- a/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java
@@ -43,6 +43,7 @@ import org.schabi.newpipe.util.ThemeHelper;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 import icepick.State;
@@ -68,18 +69,19 @@ public class StatisticsPlaylistFragment
     private HistoryRecordManager recordManager;
 
     private List<StreamStatisticsEntry> processResult(final List<StreamStatisticsEntry> results) {
+        final Comparator<StreamStatisticsEntry> comparator;
         switch (sortMode) {
             case LAST_PLAYED:
-                Collections.sort(results, (left, right) ->
-                        right.getLatestAccessDate().compareTo(left.getLatestAccessDate()));
-                return results;
+                comparator = Comparator.comparing(StreamStatisticsEntry::getLatestAccessDate);
+                break;
             case MOST_PLAYED:
-                Collections.sort(results, (left, right) ->
-                        Long.compare(right.getWatchCount(), left.getWatchCount()));
-                return results;
+                comparator = Comparator.comparingLong(StreamStatisticsEntry::getWatchCount);
+                break;
             default:
                 return null;
         }
+        Collections.sort(results, comparator.reversed());
+        return results;
     }
 
     ///////////////////////////////////////////////////////////////////////////
diff --git a/app/src/main/java/org/schabi/newpipe/util/ListHelper.java b/app/src/main/java/org/schabi/newpipe/util/ListHelper.java
index e26c00fb2..0c840f8c3 100644
--- a/app/src/main/java/org/schabi/newpipe/util/ListHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/ListHelper.java
@@ -18,6 +18,7 @@ import org.schabi.newpipe.extractor.stream.VideoStream;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 
@@ -265,10 +266,8 @@ public final class ListHelper {
      */
     private static void sortStreamList(final List<VideoStream> videoStreams,
                                        final boolean ascendingOrder) {
-        Collections.sort(videoStreams, (o1, o2) -> {
-            final int result = compareVideoStreamResolution(o1, o2);
-            return result == 0 ? 0 : (ascendingOrder ? result : -result);
-        });
+        final Comparator<VideoStream> comparator = ListHelper::compareVideoStreamResolution;
+        Collections.sort(videoStreams, ascendingOrder ? comparator : comparator.reversed());
     }
 
     /**
diff --git a/app/src/main/java/us/shandian/giga/get/Mission.java b/app/src/main/java/us/shandian/giga/get/Mission.java
index 8e814a2af..ff1319884 100644
--- a/app/src/main/java/us/shandian/giga/get/Mission.java
+++ b/app/src/main/java/us/shandian/giga/get/Mission.java
@@ -35,6 +35,10 @@ public abstract class Mission implements Serializable {
      */
     public StoredFileHelper storage;
 
+    public long getTimestamp() {
+        return timestamp;
+    }
+
     /**
      * Delete the downloaded file
      *
diff --git a/app/src/main/java/us/shandian/giga/service/DownloadManager.java b/app/src/main/java/us/shandian/giga/service/DownloadManager.java
index 994c6ee63..4c73fbfea 100644
--- a/app/src/main/java/us/shandian/giga/service/DownloadManager.java
+++ b/app/src/main/java/us/shandian/giga/service/DownloadManager.java
@@ -12,6 +12,7 @@ import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.Iterator;
 
 import us.shandian.giga.get.DownloadMission;
@@ -198,7 +199,7 @@ public class DownloadManager {
         }
 
         if (mMissionsPending.size() > 1)
-            Collections.sort(mMissionsPending, (mission1, mission2) -> Long.compare(mission1.timestamp, mission2.timestamp));
+            Collections.sort(mMissionsPending, Comparator.comparingLong(Mission::getTimestamp));
     }
 
     /**
diff --git a/checkstyle-suppressions.xml b/checkstyle-suppressions.xml
index 70a2afe73..43ee99958 100644
--- a/checkstyle-suppressions.xml
+++ b/checkstyle-suppressions.xml
@@ -13,7 +13,7 @@
 
   <suppress checks="FinalParameters"
       files="ListHelper.java"
-      lines="282,314"/>
+      lines="281,313"/>
 
   <!-- org.schabi.newpipe.streams -->
   <suppress checks="LineLength"