diff --git a/feature/album/src/main/java/com/oscarliang/spotifyclone/feature/album/AlbumFragment.java b/feature/album/src/main/java/com/oscarliang/spotifyclone/feature/album/AlbumFragment.java
index 764cd61..8777152 100644
--- a/feature/album/src/main/java/com/oscarliang/spotifyclone/feature/album/AlbumFragment.java
+++ b/feature/album/src/main/java/com/oscarliang/spotifyclone/feature/album/AlbumFragment.java
@@ -41,7 +41,7 @@
 
 public class AlbumFragment extends Fragment {
 
-    public static final String ALBUM_ID_KEY = "albumId";
+    private static final String ALBUM_ID_KEY = "albumId";
 
     @Inject
     MusicPlayer musicPlayer;
diff --git a/feature/home/src/main/java/com/oscarliang/spotifyclone/feature/home/HomeFragment.java b/feature/home/src/main/java/com/oscarliang/spotifyclone/feature/home/HomeFragment.java
index 1efc73b..ae52ac6 100644
--- a/feature/home/src/main/java/com/oscarliang/spotifyclone/feature/home/HomeFragment.java
+++ b/feature/home/src/main/java/com/oscarliang/spotifyclone/feature/home/HomeFragment.java
@@ -27,14 +27,14 @@
 
 public class HomeFragment extends Fragment {
 
+    @Inject
+    ViewModelProvider.Factory factory;
+
     private AutoClearedValue<FragmentHomeBinding> binding;
     private AlbumCardAdapter albumCardAdapter;
     private ArtistCardAdapter artistCardAdapter;
     private HomeViewModel viewModel;
 
-    @Inject
-    ViewModelProvider.Factory factory;
-
     private final CompositeDisposable disposables = new CompositeDisposable();
 
     public HomeFragment() {
diff --git a/feature/login/src/main/java/com/oscarliang/spotifyclone/feature/login/LoginFragment.java b/feature/login/src/main/java/com/oscarliang/spotifyclone/feature/login/LoginFragment.java
index 5007f73..f9cc2a4 100644
--- a/feature/login/src/main/java/com/oscarliang/spotifyclone/feature/login/LoginFragment.java
+++ b/feature/login/src/main/java/com/oscarliang/spotifyclone/feature/login/LoginFragment.java
@@ -33,12 +33,12 @@
 public class LoginFragment extends Fragment implements
         ResetPasswordDialog.onSendResetPasswordEmailClickListener {
 
-    private AutoClearedValue<FragmentLoginBinding> binding;
-    private LoginViewModel viewModel;
-
     @Inject
     ViewModelProvider.Factory factory;
 
+    private AutoClearedValue<FragmentLoginBinding> binding;
+    private LoginViewModel viewModel;
+
     private final CompositeDisposable disposables = new CompositeDisposable();
 
     public LoginFragment() {