diff --git a/app/src/main/java/net/nullsum/audinaut/service/OfflineMusicService.java b/app/src/main/java/net/nullsum/audinaut/service/OfflineMusicService.java
index 4cb2aac..120ab01 100644
--- a/app/src/main/java/net/nullsum/audinaut/service/OfflineMusicService.java
+++ b/app/src/main/java/net/nullsum/audinaut/service/OfflineMusicService.java
@@ -228,31 +228,13 @@ public class OfflineMusicService implements MusicService {
         }
 
         Collections.sort(artists, (lhs, rhs) -> {
-            if (lhs.getCloseness() == rhs.getCloseness()) {
-                return 0;
-            } else if (lhs.getCloseness() > rhs.getCloseness()) {
-                return -1;
-            } else {
-                return 1;
-            }
+            return Integer.compare(rhs.getCloseness(), lhs.getCloseness());
         });
         Collections.sort(albums, (lhs, rhs) -> {
-            if (lhs.getCloseness() == rhs.getCloseness()) {
-                return 0;
-            } else if (lhs.getCloseness() > rhs.getCloseness()) {
-                return -1;
-            } else {
-                return 1;
-            }
+            return Integer.compare(rhs.getCloseness(), lhs.getCloseness());
         });
         Collections.sort(songs, (lhs, rhs) -> {
-            if (lhs.getCloseness() == rhs.getCloseness()) {
-                return 0;
-            } else if (lhs.getCloseness() > rhs.getCloseness()) {
-                return -1;
-            } else {
-                return 1;
-            }
+            return Integer.compare(rhs.getCloseness(), lhs.getCloseness());
         });
 
         // Respect counts in search criteria
diff --git a/app/src/main/java/net/nullsum/audinaut/util/CacheCleaner.java b/app/src/main/java/net/nullsum/audinaut/util/CacheCleaner.java
index 5e55cca..16eaace 100644
--- a/app/src/main/java/net/nullsum/audinaut/util/CacheCleaner.java
+++ b/app/src/main/java/net/nullsum/audinaut/util/CacheCleaner.java
@@ -136,13 +136,7 @@ public class CacheCleaner {
 
     private void sortByAscendingModificationTime(List<File> files) {
         Collections.sort(files, (a, b) -> {
-            if (a.lastModified() < b.lastModified()) {
-                return -1;
-            }
-            if (a.lastModified() > b.lastModified()) {
-                return 1;
-            }
-            return 0;
+            return Long.compare(a.lastModified(), b.lastModified());
         });
     }