diff --git a/app/build.gradle b/app/build.gradle
index 0c4cade4..23b6f3aa 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -65,8 +65,6 @@ android {
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-
     // AndroidX
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0'
diff --git a/app/src/main/java/com/cappielloantonio/tempo/subsonic/base/ApiResponse.kt b/app/src/main/java/com/cappielloantonio/tempo/subsonic/base/ApiResponse.kt
index c6715031..78745202 100644
--- a/app/src/main/java/com/cappielloantonio/tempo/subsonic/base/ApiResponse.kt
+++ b/app/src/main/java/com/cappielloantonio/tempo/subsonic/base/ApiResponse.kt
@@ -7,5 +7,5 @@ import com.google.gson.annotations.SerializedName
 @Keep
 class ApiResponse {
     @SerializedName("subsonic-response")
-    lateinit var subsonicResponse: SubsonicResponse;
+    lateinit var subsonicResponse: SubsonicResponse
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/PlaylistEditorDialog.java b/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/PlaylistEditorDialog.java
index 9a5c759f..edc949c9 100644
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/PlaylistEditorDialog.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/PlaylistEditorDialog.java
@@ -31,7 +31,8 @@ import java.util.Objects;
 public class PlaylistEditorDialog extends DialogFragment {
     private DialogPlaylistEditorBinding bind;
     private PlaylistEditorViewModel playlistEditorViewModel;
-    private PlaylistCallback playlistCallback;
+
+    private final PlaylistCallback playlistCallback;
 
     private String playlistName;
     private PlaylistDialogSongHorizontalAdapter playlistDialogSongHorizontalAdapter;
diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/PodcastChannelEditorDialog.java b/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/PodcastChannelEditorDialog.java
index 09d92b3c..2226ab85 100644
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/PodcastChannelEditorDialog.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/PodcastChannelEditorDialog.java
@@ -20,7 +20,8 @@ import java.util.Objects;
 public class PodcastChannelEditorDialog extends DialogFragment {
     private DialogPodcastChannelEditorBinding bind;
     private PodcastChannelEditorViewModel podcastChannelEditorViewModel;
-    private PodcastCallback podcastCallback;
+
+    private final PodcastCallback podcastCallback;
 
     private String channelUrl;
 
diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/RadioEditorDialog.java b/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/RadioEditorDialog.java
index 38cb7a82..b4aba968 100644
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/RadioEditorDialog.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/RadioEditorDialog.java
@@ -21,7 +21,8 @@ import java.util.Objects;
 public class RadioEditorDialog extends DialogFragment {
     private DialogRadioEditorBinding bind;
     private RadioEditorViewModel radioEditorViewModel;
-    private RadioCallback radioCallback;
+
+    private final RadioCallback radioCallback;
 
     private String radioName;
     private String radioStreamURL;
diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/TrackInfoDialog.java b/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/TrackInfoDialog.java
index aad842c3..ca9b6d20 100644
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/TrackInfoDialog.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/TrackInfoDialog.java
@@ -17,7 +17,8 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
 public class TrackInfoDialog extends DialogFragment {
     private DialogTrackInfoBinding bind;
-    private MediaMetadata mediaMetadata;
+
+    private final MediaMetadata mediaMetadata;
 
     public TrackInfoDialog(MediaMetadata mediaMetadata) {
         this.mediaMetadata = mediaMetadata;
@@ -28,7 +29,7 @@ public class TrackInfoDialog extends DialogFragment {
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         bind = DialogTrackInfoBinding.inflate(getLayoutInflater());
 
-        return new MaterialAlertDialogBuilder(getActivity())
+        return new MaterialAlertDialogBuilder(requireActivity())
                 .setView(bind.getRoot())
                 .setPositiveButton(R.string.track_info_dialog_positive_button, (dialog, id) -> dialog.cancel())
                 .create();
diff --git a/app/src/main/java/com/cappielloantonio/tempo/viewmodel/IndexViewModel.java b/app/src/main/java/com/cappielloantonio/tempo/viewmodel/IndexViewModel.java
index 9cfa67f5..8801519b 100644
--- a/app/src/main/java/com/cappielloantonio/tempo/viewmodel/IndexViewModel.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/viewmodel/IndexViewModel.java
@@ -15,8 +15,6 @@ public class IndexViewModel extends AndroidViewModel {
 
     private MusicFolder musicFolder;
 
-    private MutableLiveData<Indexes> indexes = new MutableLiveData<>(null);
-
     public IndexViewModel(@NonNull Application application) {
         super(application);