diff --git a/app/src/main/java/com/cappielloantonio/play/model/Album.java b/app/src/main/java/com/cappielloantonio/play/model/Album.java
index 0cd539ce..2d868c48 100644
--- a/app/src/main/java/com/cappielloantonio/play/model/Album.java
+++ b/app/src/main/java/com/cappielloantonio/play/model/Album.java
@@ -20,16 +20,16 @@ public class Album implements Parcelable {
     public static final String RECENTLY_ADDED = "RECENTLY_ADDED";
     public static final String STARRED = "STARRED";
 
-    public String id;
-    public String title;
-    public int year;
-    public String artistId;
-    public String artistName;
-    public String primary;
-    public String blurHash;
-    public boolean favorite;
-    public List<Song> songs;
-    public String notes;
+    private String id;
+    private String title;
+    private int year;
+    private String artistId;
+    private String artistName;
+    private String primary;
+    private String blurHash;
+    private boolean favorite;
+    private List<Song> songs;
+    private String notes;
 
     public Album(AlbumID3 albumID3) {
         this.id = albumID3.getId();
diff --git a/app/src/main/java/com/cappielloantonio/play/model/Artist.java b/app/src/main/java/com/cappielloantonio/play/model/Artist.java
index 4304f206..d83cfbd6 100644
--- a/app/src/main/java/com/cappielloantonio/play/model/Artist.java
+++ b/app/src/main/java/com/cappielloantonio/play/model/Artist.java
@@ -19,22 +19,22 @@ public class Artist implements Parcelable {
 
     public static final String STARRED = "STARRED";
 
-    public List<Genre> genres;
-    public List<Album> albums;
-    public List<Song> songs;
-    public List<Artist> similarArtists;
+    private List<Genre> genres;
+    private List<Album> albums;
+    private List<Song> songs;
+    private List<Artist> similarArtists;
 
-    public String id;
-    public String name;
-    public String primary;
-    public String primaryBlurHash;
-    public String backdrop;
-    public String backdropBlurHash;
-    public int albumCount;
-    public boolean favorite;
-    public String bio;
-    public String imageUrl;
-    public String lastfm;
+    private String id;
+    private String name;
+    private String primary;
+    private String primaryBlurHash;
+    private String backdrop;
+    private String backdropBlurHash;
+    private int albumCount;
+    private boolean favorite;
+    private String bio;
+    private String imageUrl;
+    private String lastfm;
 
     public Artist(ArtistID3 artistID3) {
         this.id = artistID3.getId();
diff --git a/app/src/main/java/com/cappielloantonio/play/model/Genre.java b/app/src/main/java/com/cappielloantonio/play/model/Genre.java
index da1f0d84..4de716ed 100644
--- a/app/src/main/java/com/cappielloantonio/play/model/Genre.java
+++ b/app/src/main/java/com/cappielloantonio/play/model/Genre.java
@@ -6,10 +6,10 @@ import android.os.Parcelable;
 import androidx.annotation.NonNull;
 
 public class Genre implements Parcelable {
-    public String id;
-    public String name;
-    public int songCount;
-    public int albumCount;
+    private String id;
+    private String name;
+    private int songCount;
+    private int albumCount;
 
     public Genre(com.cappielloantonio.play.subsonic.models.Genre genre) {
         this.id = genre.getGenre();
diff --git a/app/src/main/java/com/cappielloantonio/play/viewmodel/ArtistPageViewModel.java b/app/src/main/java/com/cappielloantonio/play/viewmodel/ArtistPageViewModel.java
index 67d8bc84..fa4da2f9 100644
--- a/app/src/main/java/com/cappielloantonio/play/viewmodel/ArtistPageViewModel.java
+++ b/app/src/main/java/com/cappielloantonio/play/viewmodel/ArtistPageViewModel.java
@@ -39,7 +39,7 @@ public class ArtistPageViewModel extends AndroidViewModel {
     }
 
     public LiveData<List<Album>> getAlbumList() {
-        albumList = albumRepository.getArtistAlbums(artist.id);
+        albumList = albumRepository.getArtistAlbums(artist.getId());
         return albumList;
     }