diff --git a/core/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/CommonFunctions.kt b/core/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/CommonFunctions.kt
index 8414a0ab..68f4f7dd 100644
--- a/core/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/CommonFunctions.kt
+++ b/core/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/CommonFunctions.kt
@@ -22,11 +22,10 @@ val CLIENT_VERSION = SubsonicAPIVersions.V1_16_0
 const val CLIENT_ID = "test-client"
 
 val dateFormat by lazy(
-    LazyThreadSafetyMode.NONE,
-    {
-        SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ", Locale.US)
-    }
-)
+    LazyThreadSafetyMode.NONE
+) {
+    SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ", Locale.US)
+}
 
 fun MockWebServerRule.enqueueResponse(resourceName: String) {
     mockWebServer.enqueueResponse(resourceName)
diff --git a/ultrasonic/build.gradle b/ultrasonic/build.gradle
index 53a2929e..1b4de423 100644
--- a/ultrasonic/build.gradle
+++ b/ultrasonic/build.gradle
@@ -47,7 +47,7 @@ android {
 
     lintOptions {
         baselineFile file("lint-baseline.xml")
-        warning 'MissingTranslation'
+        ignore 'MissingTranslation'
         warning 'ImpliedQuantity'
         abortOnError true
     }
diff --git a/ultrasonic/src/main/assets/html/fr/index.html b/ultrasonic/src/main/assets/html/fr/index.html
index 81334bf9..b786767d 100644
--- a/ultrasonic/src/main/assets/html/fr/index.html
+++ b/ultrasonic/src/main/assets/html/fr/index.html
@@ -20,7 +20,7 @@
 </p>
 
 <p>
-    Par d&eacute;faut, cette application n'est pas configur&eacutee</b>. Apr&egrave;s avoir configur&eacute; votre 
+    Par d&eacute;faut, cette application n'est pas configur&eacutee. Apr&egrave;s avoir configur&eacute; votre
 	serveur personnel, veuillez acc&eacute;der aux <b>Param&egrave;tres</b> et modifier la configuration afin de vous connecter &agrave; votre propre ordinateur ou vos appareils mobiles.
 </p>
 
diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/fragment/AboutFragment.java b/ultrasonic/src/main/java/org/moire/ultrasonic/fragment/AboutFragment.java
index ad397631..dd8d735d 100644
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/fragment/AboutFragment.java
+++ b/ultrasonic/src/main/java/org/moire/ultrasonic/fragment/AboutFragment.java
@@ -21,7 +21,7 @@ import org.moire.ultrasonic.R;
 import org.moire.ultrasonic.util.Util;
 
 /**
- * Displays online help and about information in a webWiew
+ * Displays online help and about information in a WebView
  */
 public class AboutFragment extends Fragment {
 
diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/service/MediaPlayerController.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/MediaPlayerController.java
index de94b05a..4384ad90 100644
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/service/MediaPlayerController.java
+++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/MediaPlayerController.java
@@ -18,8 +18,6 @@
  */
 package org.moire.ultrasonic.service;
 
-import org.moire.ultrasonic.audiofx.EqualizerController;
-import org.moire.ultrasonic.audiofx.VisualizerController;
 import org.moire.ultrasonic.domain.MusicDirectory.Entry;
 import org.moire.ultrasonic.domain.PlayerState;
 import org.moire.ultrasonic.domain.RepeatMode;
diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/util/CacheCleaner.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/CacheCleaner.java
index 58059173..a61e0946 100644
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/util/CacheCleaner.java
+++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/CacheCleaner.java
@@ -24,11 +24,6 @@ import kotlin.Lazy;
 
 import static org.koin.java.KoinJavaComponent.inject;
 
-/**
- * @author Sindre Mehus
- * @version $Id$
- */
-
 /**
  * Responsible for cleaning up files from the offline download cache on the filesystem
  */
@@ -207,17 +202,8 @@ public class CacheCleaner
 			@Override
 			public int compare(File a, File b)
 			{
-				if (a.lastModified() < b.lastModified())
-				{
-					return -1;
-				}
+				return Long.compare(a.lastModified(), b.lastModified());
 
-				if (a.lastModified() > b.lastModified())
-				{
-					return 1;
-				}
-
-				return 0;
 			}
 		});
 	}
diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/util/EntryByDiscAndTrackComparator.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/EntryByDiscAndTrackComparator.java
index bc24dfa6..cbf91c91 100644
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/util/EntryByDiscAndTrackComparator.java
+++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/EntryByDiscAndTrackComparator.java
@@ -47,7 +47,7 @@ public class EntryByDiscAndTrackComparator implements Comparator<MusicDirectory.
 
 	private static int compare(long a, long b)
 	{
-		return a < b ? -1 : a > b ? 1 : 0;
+		return Long.compare(a, b);
 	}
 
 	private static int compare(String a, String b)
diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/util/MergeAdapter.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/MergeAdapter.java
index 834cee30..7d8880be 100644
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/util/MergeAdapter.java
+++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/MergeAdapter.java
@@ -1,4 +1,4 @@
-/***
+/**
  Copyright (c) 2008-2009 CommonsWare, LLC
  Portions (c) 2009 Google, Inc.
 
diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/util/SackOfViewsAdapter.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/SackOfViewsAdapter.java
index 22d7ed66..080e1430 100644
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/util/SackOfViewsAdapter.java
+++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/SackOfViewsAdapter.java
@@ -1,4 +1,4 @@
-/***
+/**
  Copyright (c) 2008-2009 CommonsWare, LLC
  Portions (c) 2009 Google, Inc.
 
diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/view/ArtistAdapter.java b/ultrasonic/src/main/java/org/moire/ultrasonic/view/ArtistAdapter.java
index b1a7d42b..04471395 100644
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/view/ArtistAdapter.java
+++ b/ultrasonic/src/main/java/org/moire/ultrasonic/view/ArtistAdapter.java
@@ -68,8 +68,8 @@ public class ArtistAdapter extends ArrayAdapter<Artist> implements SectionIndexe
 			}
 		}
 
-		sections = sectionSet.toArray(new Object[sectionSet.size()]);
-		positions = positionList.toArray(new Integer[positionList.size()]);
+		sections = sectionSet.toArray(new Object[0]);
+		positions = positionList.toArray(new Integer[0]);
 	}
 
     @NonNull
diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/view/AutoRepeatButton.java b/ultrasonic/src/main/java/org/moire/ultrasonic/view/AutoRepeatButton.java
index 1d501df0..c17abcf9 100644
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/view/AutoRepeatButton.java
+++ b/ultrasonic/src/main/java/org/moire/ultrasonic/view/AutoRepeatButton.java
@@ -4,7 +4,6 @@ import android.content.Context;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
-import android.widget.ImageView;
 
 import androidx.appcompat.widget.AppCompatImageView;
 
diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/view/GenreAdapter.java b/ultrasonic/src/main/java/org/moire/ultrasonic/view/GenreAdapter.java
index f21d827d..5b8f422e 100644
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/view/GenreAdapter.java
+++ b/ultrasonic/src/main/java/org/moire/ultrasonic/view/GenreAdapter.java
@@ -66,8 +66,8 @@ public class GenreAdapter extends ArrayAdapter<Genre> implements SectionIndexer
 			}
 		}
 
-		sections = sectionSet.toArray(new Object[sectionSet.size()]);
-		positions = positionList.toArray(new Integer[positionList.size()]);
+		sections = sectionSet.toArray(new Object[0]);
+		positions = positionList.toArray(new Integer[0]);
 	}
 
     @NonNull
diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/view/PodcastsChannelsAdapter.java b/ultrasonic/src/main/java/org/moire/ultrasonic/view/PodcastsChannelsAdapter.java
index 28ac4763..b821a197 100644
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/view/PodcastsChannelsAdapter.java
+++ b/ultrasonic/src/main/java/org/moire/ultrasonic/view/PodcastsChannelsAdapter.java
@@ -32,7 +32,7 @@ public class PodcastsChannelsAdapter extends ArrayAdapter<PodcastsChannel> {
         PodcastsChannel entry = getItem(position);
 
         TextView view;
-        if (convertView != null && convertView instanceof PlaylistView) {
+        if (convertView instanceof PlaylistView) {
             view = (TextView) convertView;
         } else {
             view = (TextView) layoutInflater
diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/view/SongListAdapter.java b/ultrasonic/src/main/java/org/moire/ultrasonic/view/SongListAdapter.java
index 1844e4d2..16faf837 100644
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/view/SongListAdapter.java
+++ b/ultrasonic/src/main/java/org/moire/ultrasonic/view/SongListAdapter.java
@@ -28,7 +28,7 @@ public class SongListAdapter extends ArrayAdapter<DownloadFile>
 
 		SongView view;
 
-		if (convertView != null && convertView instanceof SongView)
+		if (convertView instanceof SongView)
 		{
 			SongView currentView = (SongView) convertView;
 			if (currentView.getEntry().equals(entry))