diff --git a/app/src/main/java/com/cappielloantonio/play/repository/AlbumRepository.java b/app/src/main/java/com/cappielloantonio/play/repository/AlbumRepository.java
index 92a5dbd9..e39447bd 100644
--- a/app/src/main/java/com/cappielloantonio/play/repository/AlbumRepository.java
+++ b/app/src/main/java/com/cappielloantonio/play/repository/AlbumRepository.java
@@ -3,7 +3,6 @@ package com.cappielloantonio.play.repository;
 import android.app.Application;
 
 import androidx.annotation.NonNull;
-import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 
 import com.cappielloantonio.play.App;
@@ -11,15 +10,12 @@ import com.cappielloantonio.play.interfaces.DecadesCallback;
 import com.cappielloantonio.play.interfaces.MediaCallback;
 import com.cappielloantonio.play.model.Album;
 import com.cappielloantonio.play.model.Song;
-import com.cappielloantonio.play.subsonic.models.ResponseStatus;
 import com.cappielloantonio.play.subsonic.models.SubsonicResponse;
 import com.cappielloantonio.play.util.MappingUtil;
 
 import java.util.ArrayList;
 import java.util.Calendar;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -42,10 +38,10 @@ public class AlbumRepository {
                 .getAlbumList2(type, size, 0, null, null)
                 .enqueue(new Callback<SubsonicResponse>() {
                     @Override
-                    public void onResponse(@NonNull Call <SubsonicResponse> call, @NonNull Response<SubsonicResponse> response) {
+                    public void onResponse(@NonNull Call<SubsonicResponse> call, @NonNull Response<SubsonicResponse> response) {
                         List<Album> albums = new ArrayList<>();
 
-                        if(response.isSuccessful() && response.body() != null && response.body().getAlbumList2() != null) {
+                        if (response.isSuccessful() && response.body() != null && response.body().getAlbumList2() != null) {
                             albums.addAll(MappingUtil.mapAlbum(response.body().getAlbumList2().getAlbums()));
                         }
 
@@ -72,7 +68,7 @@ public class AlbumRepository {
                     public void onResponse(@NonNull Call<SubsonicResponse> call, @NonNull Response<SubsonicResponse> response) {
                         List<Album> albums = new ArrayList<>();
 
-                        if(response.isSuccessful() && response.body() != null && response.body().getStarred2() != null) {
+                        if (response.isSuccessful() && response.body() != null && response.body().getStarred2() != null) {
                             albums.addAll(MappingUtil.mapAlbum(response.body().getStarred2().getAlbums()));
                         }
 
@@ -150,7 +146,7 @@ public class AlbumRepository {
                     public void onResponse(@NonNull Call<SubsonicResponse> call, @NonNull Response<SubsonicResponse> response) {
                         List<Song> tracks = new ArrayList<>();
 
-                        if(response.isSuccessful() && response.body() != null && response.body().getAlbum() != null) {
+                        if (response.isSuccessful() && response.body() != null && response.body().getAlbum() != null) {
                             tracks.addAll(MappingUtil.mapSong(response.body().getAlbum().getSongs()));
                         }
 
@@ -177,7 +173,7 @@ public class AlbumRepository {
                     public void onResponse(@NonNull Call<SubsonicResponse> call, @NonNull Response<SubsonicResponse> response) {
                         List<Album> albums = new ArrayList<>();
 
-                        if(response.isSuccessful() && response.body() != null && response.body().getArtist() != null) {
+                        if (response.isSuccessful() && response.body() != null && response.body().getArtist() != null) {
                             albums.addAll(MappingUtil.mapAlbum(response.body().getArtist().getAlbums()));
                         }
 
@@ -202,7 +198,7 @@ public class AlbumRepository {
                 .enqueue(new Callback<SubsonicResponse>() {
                     @Override
                     public void onResponse(@NonNull Call<SubsonicResponse> call, @NonNull Response<SubsonicResponse> response) {
-                        if(response.isSuccessful() && response.body() != null && response.body().getAlbum() != null) {
+                        if (response.isSuccessful() && response.body() != null && response.body().getAlbum() != null) {
                             album.setValue(MappingUtil.mapAlbum(response.body().getAlbum()));
                         }
                     }
@@ -225,7 +221,7 @@ public class AlbumRepository {
                 .enqueue(new Callback<SubsonicResponse>() {
                     @Override
                     public void onResponse(@NonNull Call<SubsonicResponse> call, @NonNull Response<SubsonicResponse> response) {
-                        if(response.isSuccessful() && response.body() != null && response.body().getAlbumInfo() != null) {
+                        if (response.isSuccessful() && response.body() != null && response.body().getAlbumInfo() != null) {
                             album.setValue(MappingUtil.mapAlbum(response.body().getAlbumInfo()));
                         }
                     }
@@ -248,7 +244,7 @@ public class AlbumRepository {
                     public void onResponse(@NonNull Call<SubsonicResponse> call, @NonNull Response<SubsonicResponse> response) {
                         List<Song> songs = new ArrayList<>();
 
-                        if(response.isSuccessful() && response.body() != null && response.body().getSimilarSongs2() != null) {
+                        if (response.isSuccessful() && response.body() != null && response.body().getSimilarSongs2() != null) {
                             songs.addAll(MappingUtil.mapSong(response.body().getSimilarSongs2().getSongs()));
                         }
 
@@ -266,7 +262,7 @@ public class AlbumRepository {
         MutableLiveData<List<Integer>> decades = new MutableLiveData<>();
 
         getFirstAlbum(first -> getLastAlbum(last -> {
-            if(first != -1 && last != -1) {
+            if (first != -1 && last != -1) {
                 List<Integer> decadeList = new ArrayList();
 
                 int startDecade = first - (first % 10);
@@ -291,7 +287,7 @@ public class AlbumRepository {
                 .enqueue(new Callback<SubsonicResponse>() {
                     @Override
                     public void onResponse(@NonNull Call<SubsonicResponse> call, @NonNull Response<SubsonicResponse> response) {
-                        if(response.isSuccessful() && response.body() != null && response.body().getAlbumList2() != null && response.body().getAlbumList2().getAlbums() != null && response.body().getAlbumList2().getAlbums().get(0) != null) {
+                        if (response.isSuccessful() && response.body() != null && response.body().getAlbumList2() != null && response.body().getAlbumList2().getAlbums() != null && response.body().getAlbumList2().getAlbums().get(0) != null) {
                             callback.onLoadYear(response.body().getAlbumList2().getAlbums().get(0).getYear());
                         }
                     }
@@ -311,10 +307,9 @@ public class AlbumRepository {
                     @Override
                     public void onResponse(@NonNull Call<SubsonicResponse> call, @NonNull Response<SubsonicResponse> response) {
                         if (response.isSuccessful() && response.body() != null && response.body().getAlbumList2() != null) {
-                            if(response.body().getAlbumList2().getAlbums().size() > 0 && response.body().getAlbumList2().getAlbums().get(0) != null){
+                            if (response.body().getAlbumList2().getAlbums().size() > 0 && response.body().getAlbumList2().getAlbums().get(0) != null) {
                                 callback.onLoadYear(response.body().getAlbumList2().getAlbums().get(0).getYear());
-                            }
-                            else {
+                            } else {
                                 callback.onLoadYear(-1);
                             }
                         }
diff --git a/app/src/main/java/com/cappielloantonio/play/repository/ArtistRepository.java b/app/src/main/java/com/cappielloantonio/play/repository/ArtistRepository.java
index 7b69b174..48b85857 100644
--- a/app/src/main/java/com/cappielloantonio/play/repository/ArtistRepository.java
+++ b/app/src/main/java/com/cappielloantonio/play/repository/ArtistRepository.java
@@ -39,7 +39,7 @@ public class ArtistRepository {
                 .enqueue(new Callback<SubsonicResponse>() {
                     @Override
                     public void onResponse(@NonNull Call<SubsonicResponse> call, @NonNull Response<SubsonicResponse> response) {
-                        if(response.isSuccessful() && response.body() != null && response.body().getStarred2() != null) {
+                        if (response.isSuccessful() && response.body() != null && response.body().getStarred2() != null) {
                             List<Artist> artists = new ArrayList<>(MappingUtil.mapArtist(response.body().getStarred2().getArtists()));
                             getArtistInfo(artists, starredArtists);
                         }
@@ -102,7 +102,7 @@ public class ArtistRepository {
                     .enqueue(new Callback<SubsonicResponse>() {
                         @Override
                         public void onResponse(@NonNull Call<SubsonicResponse> call, @NonNull Response<SubsonicResponse> response) {
-                            if(response.isSuccessful() && response.body() != null && response.body().getArtist() != null) {
+                            if (response.isSuccessful() && response.body() != null && response.body().getArtist() != null) {
                                 addToMutableLiveData(list, MappingUtil.mapArtistWithAlbum(response.body().getArtist()));
                             }
                         }
@@ -124,7 +124,7 @@ public class ArtistRepository {
                 .enqueue(new Callback<SubsonicResponse>() {
                     @Override
                     public void onResponse(@NonNull Call<SubsonicResponse> call, @NonNull Response<SubsonicResponse> response) {
-                        if(response.isSuccessful() && response.body() != null && response.body().getArtist() != null) {
+                        if (response.isSuccessful() && response.body() != null && response.body().getArtist() != null) {
                             artist.setValue(MappingUtil.mapArtistWithAlbum(response.body().getArtist()));
                         }
                     }
@@ -150,7 +150,7 @@ public class ArtistRepository {
                 .enqueue(new Callback<SubsonicResponse>() {
                     @Override
                     public void onResponse(@NonNull Call<SubsonicResponse> call, @NonNull Response<SubsonicResponse> response) {
-                        if(response.isSuccessful() && response.body() != null && response.body().getArtistInfo2() != null) {
+                        if (response.isSuccessful() && response.body() != null && response.body().getArtistInfo2() != null) {
                             artistFullInfo.setValue(MappingUtil.mapArtist(response.body().getArtistInfo2()));
                         }
                     }
@@ -224,7 +224,7 @@ public class ArtistRepository {
                 .enqueue(new Callback<SubsonicResponse>() {
                     @Override
                     public void onResponse(@NonNull Call<SubsonicResponse> call, @NonNull Response<SubsonicResponse> response) {
-                        if(response.isSuccessful() && response.body() != null && response.body().getArtist() != null) {
+                        if (response.isSuccessful() && response.body() != null && response.body().getArtist() != null) {
                             artist.setValue(MappingUtil.mapArtist(response.body().getArtist()));
                         }
                     }
@@ -247,7 +247,7 @@ public class ArtistRepository {
                     public void onResponse(@NonNull Call<SubsonicResponse> call, @NonNull Response<SubsonicResponse> response) {
                         List<Song> songs = new ArrayList<>();
 
-                        if(response.isSuccessful() && response.body() != null && response.body().getSimilarSongs2() != null) {
+                        if (response.isSuccessful() && response.body() != null && response.body().getSimilarSongs2() != null) {
                             songs.addAll(MappingUtil.mapSong(response.body().getSimilarSongs2().getSongs()));
                         }
 
@@ -323,7 +323,7 @@ public class ArtistRepository {
 
     private void addToMutableLiveData(MutableLiveData<List<Artist>> liveData, Artist artist) {
         List<Artist> liveArtists = liveData.getValue();
-        if(liveArtists != null) liveArtists.add(artist);
+        if (liveArtists != null) liveArtists.add(artist);
         liveData.setValue(liveArtists);
     }
 }
diff --git a/app/src/main/java/com/cappielloantonio/play/repository/PlaylistRepository.java b/app/src/main/java/com/cappielloantonio/play/repository/PlaylistRepository.java
index e8254cb6..61f41149 100644
--- a/app/src/main/java/com/cappielloantonio/play/repository/PlaylistRepository.java
+++ b/app/src/main/java/com/cappielloantonio/play/repository/PlaylistRepository.java
@@ -6,10 +6,8 @@ import androidx.annotation.NonNull;
 import androidx.lifecycle.MutableLiveData;
 
 import com.cappielloantonio.play.App;
-import com.cappielloantonio.play.model.Album;
 import com.cappielloantonio.play.model.Playlist;
 import com.cappielloantonio.play.model.Song;
-import com.cappielloantonio.play.subsonic.models.ResponseStatus;
 import com.cappielloantonio.play.subsonic.models.SubsonicResponse;
 import com.cappielloantonio.play.util.MappingUtil;
 
@@ -39,11 +37,10 @@ public class PlaylistRepository {
                     public void onResponse(@NonNull Call<SubsonicResponse> call, @NonNull Response<SubsonicResponse> response) {
                         if (response.isSuccessful() && response.body() != null && response.body().getPlaylists() != null) {
                             List<Playlist> playlists = new ArrayList<>(MappingUtil.mapPlaylist(response.body().getPlaylists().getPlaylists()));
-                            if(random) {
+                            if (random) {
                                 Collections.shuffle(playlists);
                                 listLivePlaylists.setValue(playlists.subList(0, Math.min(playlists.size(), size)));
-                            }
-                            else {
+                            } else {
                                 listLivePlaylists.setValue(playlists);
                             }
                         }
diff --git a/app/src/main/java/com/cappielloantonio/play/repository/SearchingRepository.java b/app/src/main/java/com/cappielloantonio/play/repository/SearchingRepository.java
index e7075bb7..35c007bf 100644
--- a/app/src/main/java/com/cappielloantonio/play/repository/SearchingRepository.java
+++ b/app/src/main/java/com/cappielloantonio/play/repository/SearchingRepository.java
@@ -48,7 +48,7 @@ public class SearchingRepository {
                     public void onResponse(@NonNull Call<SubsonicResponse> call, @NonNull Response<SubsonicResponse> response) {
                         List<Song> songs = new ArrayList<>();
 
-                        if(response.isSuccessful() && response.body() != null && response.body().getSearchResult3() != null) {
+                        if (response.isSuccessful() && response.body() != null && response.body().getSearchResult3() != null) {
                             songs.addAll(MappingUtil.mapSong(response.body().getSearchResult3().getSongs()));
                         }
 
@@ -75,7 +75,7 @@ public class SearchingRepository {
                     public void onResponse(@NonNull Call<SubsonicResponse> call, @NonNull Response<SubsonicResponse> response) {
                         List<Album> albums = new ArrayList<>();
 
-                        if(response.isSuccessful() && response.body() != null && response.body().getSearchResult3() != null) {
+                        if (response.isSuccessful() && response.body() != null && response.body().getSearchResult3() != null) {
                             albums.addAll(MappingUtil.mapAlbum(response.body().getSearchResult3().getAlbums()));
                         }
 
@@ -100,9 +100,9 @@ public class SearchingRepository {
                 .enqueue(new Callback<SubsonicResponse>() {
                     @Override
                     public void onResponse(@NonNull Call<SubsonicResponse> call, @NonNull Response<SubsonicResponse> response) {
-                        List<Artist> artists  = new ArrayList<>();
+                        List<Artist> artists = new ArrayList<>();
 
-                        if(response.isSuccessful() && response.body() != null && response.body().getSearchResult3() != null) {
+                        if (response.isSuccessful() && response.body() != null && response.body().getSearchResult3() != null) {
                             artists.addAll(MappingUtil.mapArtist(response.body().getSearchResult3().getArtists()));
                         }
 
diff --git a/app/src/main/java/com/cappielloantonio/play/repository/SystemRepository.java b/app/src/main/java/com/cappielloantonio/play/repository/SystemRepository.java
index d3447170..32301a97 100644
--- a/app/src/main/java/com/cappielloantonio/play/repository/SystemRepository.java
+++ b/app/src/main/java/com/cappielloantonio/play/repository/SystemRepository.java
@@ -28,7 +28,7 @@ public class SystemRepository {
                 .enqueue(new Callback<SubsonicResponse>() {
                     @Override
                     public void onResponse(@NonNull Call<SubsonicResponse> call, @NonNull retrofit2.Response<SubsonicResponse> response) {
-                        if(response.body() != null) {
+                        if (response.body() != null) {
                             if (response.body().getStatus().getValue().equals(ResponseStatus.FAILED)) {
                                 callback.onError(new Exception(response.body().getError().getCode().getValue() + " - " + response.body().getError().getMessage()));
                             } else if (response.body().getStatus().getValue().equals(ResponseStatus.OK)) {
@@ -38,8 +38,7 @@ public class SystemRepository {
                             } else {
                                 callback.onError(new Exception("Empty response"));
                             }
-                        }
-                        else {
+                        } else {
                             callback.onError(new Exception(String.valueOf(response.code())));
                         }
                     }