diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/library/LibraryFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/library/LibraryFragment.java
index 3cf8fd5..6626d1e 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/ui/library/LibraryFragment.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/ui/library/LibraryFragment.java
@@ -36,9 +36,7 @@ import io.reactivex.rxjava3.schedulers.Schedulers;
 
 public class LibraryFragment extends MCFragment {
     // TODO: TOM: rename MonsterFragment MonsterDetailFragment
-
-    private LibraryViewModel libraryViewModel;
-
+    
     public View onCreateView(@NonNull LayoutInflater inflater,
                              ViewGroup container, Bundle savedInstanceState) {
         View root = inflater.inflate(R.layout.fragment_library, container, false);
diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/library/LibraryViewModel.java b/app/src/main/java/com/majinnaibu/monstercards/ui/library/LibraryViewModel.java
deleted file mode 100644
index 2aa32e2..0000000
--- a/app/src/main/java/com/majinnaibu/monstercards/ui/library/LibraryViewModel.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.majinnaibu.monstercards.ui.library;
-
-import androidx.lifecycle.LiveData;
-import androidx.lifecycle.MutableLiveData;
-import androidx.lifecycle.ViewModel;
-
-public class LibraryViewModel extends ViewModel {
-
-    private MutableLiveData<String> mText;
-
-    public LibraryViewModel() {
-        mText = new MutableLiveData<>();
-        mText.setValue("This is library fragment");
-    }
-
-    public LiveData<String> getText() {
-        return mText;
-    }
-}
diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterViewModel.java b/app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterViewModel.java
index 24b507a..63bc378 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterViewModel.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterViewModel.java
@@ -14,9 +14,9 @@ public class MonsterViewModel extends ViewModel {
     public MonsterViewModel() {
         mMonster = null;
         mAbilities = new MutableLiveData<>();
-        mAbilities.setValue(new ArrayList<String>());
+        mAbilities.setValue(new ArrayList<>());
         mActions = new MutableLiveData<>();
-        mActions.setValue(new ArrayList<String>());
+        mActions.setValue(new ArrayList<>());
         mArmorClass = new MutableLiveData<>();
         mArmorClass.setValue("");
         mChallenge = new MutableLiveData<>();
@@ -59,96 +59,140 @@ public class MonsterViewModel extends ViewModel {
         mWisdom.setValue("");
     }
 
-    private MutableLiveData<List<String>> mAbilities;
+    private final MutableLiveData<List<String>> mAbilities;
+
     public LiveData<List<String>> getAbilities() {
         return mAbilities;
     }
-    private MutableLiveData<List<String>> mActions;
+
+    private final MutableLiveData<List<String>> mActions;
+
     public LiveData<List<String>> getActions() {
         return mActions;
     }
-    private MutableLiveData<String> mArmorClass;
+
+    private final MutableLiveData<String> mArmorClass;
+
     public LiveData<String> getArmorClass() {
         return mArmorClass;
     }
-    private MutableLiveData<String> mChallenge;
+
+    private final MutableLiveData<String> mChallenge;
+
     public LiveData<String> getChallenge() {
         return mChallenge;
     }
-    private MutableLiveData<String> mCharisma;
+
+    private final MutableLiveData<String> mCharisma;
+
     public LiveData<String> getCharisma() {
         return mCharisma;
     }
-    private MutableLiveData<String> mConditionImmunities;
+
+    private final MutableLiveData<String> mConditionImmunities;
+
     public LiveData<String> getConditionImmunities() {
         return mConditionImmunities;
     }
-    private MutableLiveData<String> mConstitution;
+
+    private final MutableLiveData<String> mConstitution;
+
     public LiveData<String> getConstitution() {
         return mConstitution;
     }
-    private MutableLiveData<String> mDamageResistances;
+
+    private final MutableLiveData<String> mDamageResistances;
+
     public LiveData<String> getDamageResistances() {
         return mDamageResistances;
     }
-    private MutableLiveData<String> mDamageImmunities;
+
+    private final MutableLiveData<String> mDamageImmunities;
+
     public LiveData<String> getDamageImmunities() {
         return mDamageImmunities;
     }
-    private MutableLiveData<String> mDamageVulnerabilities;
+
+    private final MutableLiveData<String> mDamageVulnerabilities;
+
     public LiveData<String> getDamageVulnerabilities() {
         return mDamageVulnerabilities;
     }
-    private MutableLiveData<String> mDexterity;
+
+    private final MutableLiveData<String> mDexterity;
+
     public LiveData<String> getDexterity() {
         return mDexterity;
     }
-    private MutableLiveData<String> mHitPoints;
+
+    private final MutableLiveData<String> mHitPoints;
+
     public LiveData<String> getHitPoints() {
         return mHitPoints;
     }
-    private MutableLiveData<String> mIntelligence;
+
+    private final MutableLiveData<String> mIntelligence;
+
     public LiveData<String> getIntelligence() {
         return mIntelligence;
     }
-    private MutableLiveData<String> mLanguages;
+
+    private final MutableLiveData<String> mLanguages;
+
     public LiveData<String> getLanguages() {
         return mLanguages;
     }
-    private MutableLiveData<String> mMeta;
+
+    private final MutableLiveData<String> mMeta;
+
     public LiveData<String> getMeta() {
         return mMeta;
     }
-    private MutableLiveData<String> mName;
+
+    private final MutableLiveData<String> mName;
+
     public LiveData<String> getName() {
         return mName;
     }
-    private MutableLiveData<String> mSavingThrows;
+
+    private final MutableLiveData<String> mSavingThrows;
+
     public LiveData<String> getSavingThrows() {
         return mSavingThrows;
     }
-    private MutableLiveData<String> mSenses;
+
+    private final MutableLiveData<String> mSenses;
+
     public LiveData<String> getSenses() {
         return mSenses;
     }
-    private MutableLiveData<String> mSkills;
+
+    private final MutableLiveData<String> mSkills;
+
     public LiveData<String> getSkills() {
         return mSkills;
     }
-    private MutableLiveData<String> mSpeed;
+
+    private final MutableLiveData<String> mSpeed;
+
     public LiveData<String> getSpeed() {
         return mSpeed;
     }
-    private MutableLiveData<String> mStrength;
+
+    private final MutableLiveData<String> mStrength;
+
     public LiveData<String> getStrength() {
         return mStrength;
     }
-    private MutableLiveData<String> mWisdom;
+
+    private final MutableLiveData<String> mWisdom;
+
     public LiveData<String> getWisdom() {
         return mWisdom;
     }
 
     private Monster mMonster;
+
     public void setMonster(Monster monster) {
         mMonster = monster;
 
diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/search/SearchFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/search/SearchFragment.java
index b25276c..ff62b72 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/ui/search/SearchFragment.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/ui/search/SearchFragment.java
@@ -17,9 +17,7 @@ import com.majinnaibu.monstercards.data.MonsterRepository;
 import com.majinnaibu.monstercards.ui.MCFragment;
 
 public class SearchFragment extends MCFragment {
-
-    private SearchViewModel searchViewModel;
-
+    
     public View onCreateView(@NonNull LayoutInflater inflater,
                              ViewGroup container, Bundle savedInstanceState) {
         View root = inflater.inflate(R.layout.fragment_search, container, false);
diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/search/SearchViewModel.java b/app/src/main/java/com/majinnaibu/monstercards/ui/search/SearchViewModel.java
deleted file mode 100644
index e8fc25d..0000000
--- a/app/src/main/java/com/majinnaibu/monstercards/ui/search/SearchViewModel.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.majinnaibu.monstercards.ui.search;
-
-import androidx.lifecycle.LiveData;
-import androidx.lifecycle.MutableLiveData;
-import androidx.lifecycle.ViewModel;
-
-public class SearchViewModel extends ViewModel {
-
-    private MutableLiveData<String> mSearchQuery;
-
-    public SearchViewModel() {
-        mSearchQuery = new MutableLiveData<>();
-        mSearchQuery.setValue("");
-    }
-
-    public LiveData<String> getSearchQuery() {
-        return mSearchQuery;
-    }
-}
\ No newline at end of file