diff --git a/.idea/misc.xml b/.idea/misc.xml
index 860da66..6c2e59d 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="NullableNotNullManager">
+    <option name="myDefaultNullable" value="androidx.annotation.Nullable" />
+    <option name="myDefaultNotNull" value="androidx.annotation.NonNull" />
+    <option name="myNullables">
+      <value>
+        <list size="14">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
+          <item index="1" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
+          <item index="2" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+          <item index="3" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
+          <item index="4" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
+          <item index="5" class="java.lang.String" itemvalue="com.android.annotations.Nullable" />
+          <item index="6" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
+          <item index="7" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
+          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
+          <item index="10" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
+          <item index="11" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.Nullable" />
+          <item index="12" class="java.lang.String" itemvalue="io.reactivex.annotations.Nullable" />
+          <item index="13" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.Nullable" />
+        </list>
+      </value>
+    </option>
+    <option name="myNotNulls">
+      <value>
+        <list size="13">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
+          <item index="1" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
+          <item index="2" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+          <item index="3" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
+          <item index="4" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
+          <item index="5" class="java.lang.String" itemvalue="com.android.annotations.NonNull" />
+          <item index="6" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
+          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
+          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
+          <item index="10" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.NonNull" />
+          <item index="11" class="java.lang.String" itemvalue="io.reactivex.annotations.NonNull" />
+          <item index="12" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.NonNull" />
+        </list>
+      </value>
+    </option>
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
diff --git a/app/src/main/java/com/majinnaibu/monstercards/MainActivity.java b/app/src/main/java/com/majinnaibu/monstercards/MainActivity.java
index 88ca743..2df5ace 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/MainActivity.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/MainActivity.java
@@ -6,6 +6,7 @@ import android.os.Bundle;
 import android.view.MenuItem;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.navigation.NavController;
 import androidx.navigation.NavDirections;
@@ -54,9 +55,7 @@ public class MainActivity extends AppCompatActivity {
                 .build();
         NavHostFragment navHostFragment = (NavHostFragment) getSupportFragmentManager().findFragmentById(R.id.nav_host_fragment);
         NavController navController = navHostFragment.getNavController();
-        navController.addOnDestinationChangedListener((controller, destination, arguments) -> {
-            FlipperInitializer.sendNavigationEvent(controller, destination, arguments);
-        });
+        navController.addOnDestinationChangedListener(FlipperInitializer::sendNavigationEvent);
         NavigationUI.setupActionBarWithNavController(this, navController, appBarConfiguration);
         NavigationUI.setupWithNavController(navView, navController);
         onNewIntent(getIntent());
@@ -68,14 +67,15 @@ public class MainActivity extends AppCompatActivity {
 
         String json = readMonsterJSONFromIntent(intent);
         if (!StringHelper.isNullOrEmpty(json)) {
-            NavHostFragment navHostFragment = (NavHostFragment) getSupportFragmentManager().findFragmentById(R.id.nav_host_fragment);
+            NavHostFragment navHostFragment = Objects.requireNonNull((NavHostFragment) getSupportFragmentManager().findFragmentById(R.id.nav_host_fragment));
             NavController navController = navHostFragment.getNavController();
             NavDirections action = MobileNavigationDirections.actionGlobalMonsterImportFragment(json);
             navController.navigate(action);
         }
     }
 
-    private String readMonsterJSONFromIntent(Intent intent) {
+    @Nullable
+    private String readMonsterJSONFromIntent(@NonNull Intent intent) {
         String action = intent.getAction();
         Bundle extras = intent.getExtras();
         String type = intent.getType();
@@ -86,7 +86,7 @@ public class MainActivity extends AppCompatActivity {
         } else if ("android.intent.action.VIEW".equals(action) && ("text/plain".equals(type) || "application/octet-stream".equals(type))) {
             uri = intent.getData();
         } else {
-            Logger.logError(String.format("unexpected launch configuration action: %s, type: %s, uri: %s", action, type, uri));
+            Logger.logError(String.format("unexpected launch configuration action: %s, type: %s", action, type));
         }
         if (uri == null) {
             return null;
@@ -98,6 +98,7 @@ public class MainActivity extends AppCompatActivity {
         return json;
     }
 
+    @Nullable
     private String readContentsOfUri(Uri uri) {
         StringBuilder builder = new StringBuilder();
         try (InputStream inputStream =
diff --git a/app/src/main/java/com/majinnaibu/monstercards/data/DevContent.java b/app/src/main/java/com/majinnaibu/monstercards/data/DevContent.java
index 5a3fc5f..0145afe 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/data/DevContent.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/data/DevContent.java
@@ -1,5 +1,7 @@
 package com.majinnaibu.monstercards.data;
 
+import androidx.annotation.NonNull;
+
 import com.majinnaibu.monstercards.data.enums.AbilityScore;
 import com.majinnaibu.monstercards.data.enums.AdvantageType;
 import com.majinnaibu.monstercards.data.enums.ArmorType;
@@ -12,6 +14,7 @@ import com.majinnaibu.monstercards.models.Trait;
 
 @SuppressWarnings("unused")
 public final class DevContent {
+    @NonNull
     public static Monster createSampleMonster() {
         Monster monster = new Monster();
         // Name
diff --git a/app/src/main/java/com/majinnaibu/monstercards/data/MonsterRepository.java b/app/src/main/java/com/majinnaibu/monstercards/data/MonsterRepository.java
index db97c95..842fb2d 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/data/MonsterRepository.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/data/MonsterRepository.java
@@ -47,7 +47,7 @@ public class MonsterRepository {
                 .observeOn(AndroidSchedulers.mainThread());
     }
 
-    public Flowable<Monster> getMonster(UUID monsterId) {
+    public Flowable<Monster> getMonster(@NonNull UUID monsterId) {
         return m_db.monsterDAO()
                 .loadAllByIds(new String[]{monsterId.toString()})
                 .map(
diff --git a/app/src/main/java/com/majinnaibu/monstercards/data/converters/ArmorTypeConverter.java b/app/src/main/java/com/majinnaibu/monstercards/data/converters/ArmorTypeConverter.java
index d3b63a3..d6d1d59 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/data/converters/ArmorTypeConverter.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/data/converters/ArmorTypeConverter.java
@@ -1,5 +1,6 @@
 package com.majinnaibu.monstercards.data.converters;
 
+import androidx.annotation.NonNull;
 import androidx.room.TypeConverter;
 
 import com.majinnaibu.monstercards.data.enums.ArmorType;
@@ -7,7 +8,7 @@ import com.majinnaibu.monstercards.data.enums.ArmorType;
 public class ArmorTypeConverter {
 
     @TypeConverter
-    public static String fromArmorType(ArmorType armorType) {
+    public static String fromArmorType(@NonNull ArmorType armorType) {
         return armorType.stringValue;
     }
 
diff --git a/app/src/main/java/com/majinnaibu/monstercards/data/converters/ChallengeRatingConverter.java b/app/src/main/java/com/majinnaibu/monstercards/data/converters/ChallengeRatingConverter.java
index 47b375b..3d9712c 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/data/converters/ChallengeRatingConverter.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/data/converters/ChallengeRatingConverter.java
@@ -1,5 +1,6 @@
 package com.majinnaibu.monstercards.data.converters;
 
+import androidx.annotation.NonNull;
 import androidx.room.TypeConverter;
 
 import com.majinnaibu.monstercards.data.enums.ChallengeRating;
@@ -7,7 +8,7 @@ import com.majinnaibu.monstercards.data.enums.ChallengeRating;
 public class ChallengeRatingConverter {
 
     @TypeConverter
-    public static String fromChallengeRating(ChallengeRating challengeRating) {
+    public static String fromChallengeRating(@NonNull ChallengeRating challengeRating) {
         return challengeRating.stringValue;
     }
 
diff --git a/app/src/main/java/com/majinnaibu/monstercards/data/converters/UUIDConverter.java b/app/src/main/java/com/majinnaibu/monstercards/data/converters/UUIDConverter.java
index 07d5375..d775179 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/data/converters/UUIDConverter.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/data/converters/UUIDConverter.java
@@ -1,13 +1,15 @@
 package com.majinnaibu.monstercards.data.converters;
 
+import androidx.annotation.NonNull;
 import androidx.room.TypeConverter;
 
 import java.util.UUID;
 
 public class UUIDConverter {
 
+    @NonNull
     @TypeConverter
-    public static String fromUUID(UUID uuid) {
+    public static String fromUUID(@NonNull UUID uuid) {
         return uuid.toString();
     }
 
diff --git a/app/src/main/java/com/majinnaibu/monstercards/data/enums/AbilityScore.java b/app/src/main/java/com/majinnaibu/monstercards/data/enums/AbilityScore.java
index a155d8a..5a0b24e 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/data/enums/AbilityScore.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/data/enums/AbilityScore.java
@@ -5,7 +5,7 @@ public enum AbilityScore {
     STRENGTH("strength", "Strength", "STR"),
     DEXTERITY("dexterity", "Dexterity", "DEX"),
     CONSTITUTION("constitution", "Constitution", "CON"),
-    INTELLIGENCE("intellligence", "Intelligence", "INT"),
+    INTELLIGENCE("intelligence", "Intelligence", "INT"),
     WISDOM("wisdom", "Wisdom", "WIS"),
     CHARISMA("charisma", "Charisma", "CHA"),
     ;
diff --git a/app/src/main/java/com/majinnaibu/monstercards/data/enums/ProficiencyType.java b/app/src/main/java/com/majinnaibu/monstercards/data/enums/ProficiencyType.java
index 76754bc..9236ad0 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/data/enums/ProficiencyType.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/data/enums/ProficiencyType.java
@@ -3,7 +3,7 @@ package com.majinnaibu.monstercards.data.enums;
 public enum ProficiencyType {
     NONE("none", "None", ""),
     PROFICIENT("proficient", "Proficient", "P"),
-    EXPERTISE("experties", "Expertise", "Ex"),
+    EXPERTISE("expertise", "Expertise", "Ex"),
     ;
 
     public final String displayName;
diff --git a/app/src/main/java/com/majinnaibu/monstercards/helpers/ArrayHelper.java b/app/src/main/java/com/majinnaibu/monstercards/helpers/ArrayHelper.java
index 961db8d..2a5d044 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/helpers/ArrayHelper.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/helpers/ArrayHelper.java
@@ -1,9 +1,11 @@
 package com.majinnaibu.monstercards.helpers;
 
+import androidx.annotation.NonNull;
+
 import java.util.Objects;
 
 public final class ArrayHelper {
-    public static int indexOf(Object[] array, Object target) {
+    public static int indexOf(@NonNull Object[] array, Object target) {
         for (int index = 0; index < array.length; index++) {
             if (Objects.equals(array[index], target)) {
                 return index;
diff --git a/app/src/main/java/com/majinnaibu/monstercards/helpers/CommonMarkHelper.java b/app/src/main/java/com/majinnaibu/monstercards/helpers/CommonMarkHelper.java
index 8e8c910..bf1e931 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/helpers/CommonMarkHelper.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/helpers/CommonMarkHelper.java
@@ -4,9 +4,6 @@ import org.commonmark.node.Document;
 import org.commonmark.node.Node;
 import org.commonmark.node.Paragraph;
 import org.commonmark.parser.Parser;
-import org.commonmark.renderer.NodeRenderer;
-import org.commonmark.renderer.html.HtmlNodeRendererContext;
-import org.commonmark.renderer.html.HtmlNodeRendererFactory;
 import org.commonmark.renderer.html.HtmlRenderer;
 
 public final class CommonMarkHelper {
@@ -27,12 +24,4 @@ public final class CommonMarkHelper {
         HtmlRenderer renderer = HtmlRenderer.builder().build();
         return renderer.render(document);
     }
-
-    private static final class MyNodeRendererFactory implements HtmlNodeRendererFactory {
-
-        @Override
-        public NodeRenderer create(HtmlNodeRendererContext context) {
-            return null;
-        }
-    }
 }
diff --git a/app/src/main/java/com/majinnaibu/monstercards/helpers/MonsterImportHelper.java b/app/src/main/java/com/majinnaibu/monstercards/helpers/MonsterImportHelper.java
index d2a62b1..de7e0e8 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/helpers/MonsterImportHelper.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/helpers/MonsterImportHelper.java
@@ -1,5 +1,7 @@
 package com.majinnaibu.monstercards.helpers;
 
+import androidx.annotation.NonNull;
+
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
@@ -15,17 +17,16 @@ import com.majinnaibu.monstercards.models.Monster;
 import com.majinnaibu.monstercards.models.Skill;
 import com.majinnaibu.monstercards.models.Trait;
 
-import org.jetbrains.annotations.NotNull;
-
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Set;
 
 public class MonsterImportHelper {
+    @NonNull
     public static Monster fromJSON(String json) {
-        JsonParser parser = new JsonParser();
-        JsonObject rootDict = parser.parse(json).getAsJsonObject();
+        JsonObject rootDict = JsonParser.parseString(json).getAsJsonObject();
 
         Monster monster = new Monster();
         monster.name = Helpers.getString(rootDict, "name");
@@ -110,7 +111,7 @@ public class MonsterImportHelper {
             return getString(dict, name, "");
         }
 
-        public static String getString(@NotNull JsonObject dict, String name, String defaultValue) {
+        public static String getString(@NonNull JsonObject dict, String name, String defaultValue) {
             if (dict.has(name)) {
                 return dict.get(name).getAsString();
             }
@@ -122,13 +123,19 @@ public class MonsterImportHelper {
             return getInt(dict, name, 0);
         }
 
-        public static int getInt(@NotNull JsonObject dict, String name, int defaultValue) {
+        public static int getInt(@NonNull JsonObject dict, String name, int defaultValue) {
             if (dict.has(name)) {
                 JsonElement element = dict.get(name);
                 if (element.isJsonPrimitive()) {
-                    JsonPrimitive rawValue = element.getAsJsonPrimitive();//dict.getAsJsonPrimitive(name);
+                    JsonPrimitive rawValue = element.getAsJsonPrimitive();
                     if (rawValue.isNumber()) {
                         return rawValue.getAsInt();
+                    } else {
+                        try {
+                            return rawValue.getAsInt();
+                        } catch (Exception ex) {
+                            return defaultValue;
+                        }
                     }
                 }
             }
@@ -139,22 +146,29 @@ public class MonsterImportHelper {
             return getBool(dict, name, false);
         }
 
-        public static boolean getBool(@NotNull JsonObject dict, String name, boolean defaultValue) {
+        public static boolean getBool(@NonNull JsonObject dict, String name, boolean defaultValue) {
             if (dict.has(name)) {
                 JsonElement element = dict.get(name);
                 if (element.isJsonPrimitive()) {
                     JsonPrimitive rawValue = element.getAsJsonPrimitive();
                     if (rawValue.isBoolean()) {
                         return rawValue.getAsBoolean();
+                    } else {
+                        try {
+                            return rawValue.getAsBoolean();
+                        } catch (Exception ex) {
+                            return defaultValue;
+                        }
                     }
                 }
             }
             return defaultValue;
         }
 
-        @NotNull
+        @NonNull
         public static String formatDistance(String name, int distance) {
-            return String.format("%s %d ft.", name, distance);
+            // TODO: consider moving this to a string resource so it can be localized
+            return String.format(Locale.getDefault(), "%s %d ft.", name, distance);
         }
 
         public static void addSense(Monster monster, JsonObject root, String name) {
@@ -164,8 +178,8 @@ public class MonsterImportHelper {
             }
         }
 
-        @NotNull
-        public static List<Trait> getListOfTraits(@NotNull JsonObject dict, String name) {
+        @NonNull
+        public static List<Trait> getListOfTraits(@NonNull JsonObject dict, String name) {
             ArrayList<Trait> traits = new ArrayList<>();
             if (dict.has(name)) {
                 JsonElement arrayElement = dict.get(name);
@@ -187,7 +201,7 @@ public class MonsterImportHelper {
             return traits;
         }
 
-        public static void addSavingThrows(Monster monster, JsonObject root) {
+        public static void addSavingThrows(Monster monster, @NonNull JsonObject root) {
             if (root.has("sthrows")) {
                 JsonElement arrayElement = root.get("sthrows");
                 if (arrayElement.isJsonArray()) {
@@ -217,7 +231,8 @@ public class MonsterImportHelper {
             }
         }
 
-        public static Set<Skill> getSetOfSkills(JsonObject root) {
+        @NonNull
+        public static Set<Skill> getSetOfSkills(@NonNull JsonObject root) {
             HashSet<Skill> skills = new HashSet<>();
             if (root.has("skills")) {
                 JsonElement arrayElement = root.get("skills");
@@ -241,11 +256,13 @@ public class MonsterImportHelper {
             return skills;
         }
 
+        @NonNull
         public static Set<String> getSetOfDamageTypes(JsonObject rootDict, String name) {
             return getSetOfDamageTypes(rootDict, name, null);
         }
 
-        public static Set<String> getSetOfDamageTypes(JsonObject root, String name, String type) {
+        @NonNull
+        public static Set<String> getSetOfDamageTypes(@NonNull JsonObject root, String name, String type) {
             HashSet<String> damageTypes = new HashSet<>();
             if (root.has(name)) {
                 JsonElement arrayElement = root.get(name);
@@ -268,7 +285,8 @@ public class MonsterImportHelper {
             return damageTypes;
         }
 
-        public static Set<Language> getSetOfLanguages(JsonObject root, String name) {
+        @NonNull
+        public static Set<Language> getSetOfLanguages(@NonNull JsonObject root, String name) {
             HashSet<Language> languages = new HashSet<>();
             if (root.has(name)) {
                 JsonElement arrayElement = root.get(name);
diff --git a/app/src/main/java/com/majinnaibu/monstercards/helpers/StringHelper.java b/app/src/main/java/com/majinnaibu/monstercards/helpers/StringHelper.java
index b407000..bdad3b2 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/helpers/StringHelper.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/helpers/StringHelper.java
@@ -1,5 +1,8 @@
 package com.majinnaibu.monstercards.helpers;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import java.util.Collection;
 
 @SuppressWarnings({"RedundantIfStatement"})
@@ -16,7 +19,8 @@ public final class StringHelper {
         return false;
     }
 
-    public static String join(String delimiter, Collection<String> strings) {
+    @NonNull
+    public static String join(String delimiter, @NonNull Collection<String> strings) {
         int length = strings.size();
         if (length < 1) {
             return "";
@@ -36,7 +40,7 @@ public final class StringHelper {
         }
     }
 
-    public static String oxfordJoin(String delimiter, String lastDelimiter, String onlyDelimiter, Collection<String> strings) {
+    public static String oxfordJoin(String delimiter, String lastDelimiter, String onlyDelimiter, @NonNull Collection<String> strings) {
         int length = strings.size();
         if (length < 1) {
             return "";
@@ -59,6 +63,7 @@ public final class StringHelper {
         }
     }
 
+    @Nullable
     public static Integer parseInt(String s) {
         try {
             return Integer.parseInt(s);
@@ -67,7 +72,7 @@ public final class StringHelper {
         }
     }
 
-    public static boolean containsCaseInsensitive(String text, String search) {
+    public static boolean containsCaseInsensitive(@NonNull String text, @NonNull String search) {
         // TODO: find a locale independent way to do this
         return text.toLowerCase().contains(search.toLowerCase());
     }
diff --git a/app/src/main/java/com/majinnaibu/monstercards/models/Language.java b/app/src/main/java/com/majinnaibu/monstercards/models/Language.java
index 60e765c..a670740 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/models/Language.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/models/Language.java
@@ -1,5 +1,6 @@
 package com.majinnaibu.monstercards.models;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import java.util.Comparator;
@@ -43,7 +44,7 @@ public class Language implements Comparator<Language>, Comparable<Language> {
     }
 
     @Override
-    public int compare(Language o1, Language o2) {
+    public int compare(@NonNull Language o1, Language o2) {
         if (o1.mSpeaks && !o2.mSpeaks) {
             return -1;
         }
@@ -54,7 +55,7 @@ public class Language implements Comparator<Language>, Comparable<Language> {
     }
 
     @Override
-    public boolean equals(@Nullable @org.jetbrains.annotations.Nullable Object obj) {
+    public boolean equals(@Nullable Object obj) {
         if (obj == null) {
             return false;
         }
diff --git a/app/src/main/java/com/majinnaibu/monstercards/models/Monster.java b/app/src/main/java/com/majinnaibu/monstercards/models/Monster.java
index 1575501..aa04826 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/models/Monster.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/models/Monster.java
@@ -16,8 +16,6 @@ import com.majinnaibu.monstercards.data.enums.ProficiencyType;
 import com.majinnaibu.monstercards.helpers.StringHelper;
 import com.majinnaibu.monstercards.utils.Logger;
 
-import org.jetbrains.annotations.NotNull;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -306,7 +304,7 @@ public class Monster {
         return sb.toString();
     }
 
-    public int getAbilityScore(@NotNull AbilityScore abilityScore) {
+    public int getAbilityScore(@NonNull AbilityScore abilityScore) {
         switch (abilityScore) {
             case STRENGTH:
                 return strengthScore;
@@ -325,7 +323,7 @@ public class Monster {
         }
     }
 
-    public int getAbilityModifier(@NotNull AbilityScore abilityScore) {
+    public int getAbilityModifier(@NonNull AbilityScore abilityScore) {
         switch (abilityScore) {
             case STRENGTH:
                 return getStrengthModifier();
@@ -344,7 +342,7 @@ public class Monster {
         }
     }
 
-    public AdvantageType getSavingThrowAdvantageType(@NotNull AbilityScore abilityScore) {
+    public AdvantageType getSavingThrowAdvantageType(@NonNull AbilityScore abilityScore) {
         switch (abilityScore) {
             case STRENGTH:
                 return strengthSavingThrowAdvantage;
@@ -363,7 +361,7 @@ public class Monster {
         }
     }
 
-    public ProficiencyType getSavingThrowProficiencyType(@NotNull AbilityScore abilityScore) {
+    public ProficiencyType getSavingThrowProficiencyType(@NonNull AbilityScore abilityScore) {
         switch (abilityScore) {
             case STRENGTH:
                 return strengthSavingThrowProficiency;
@@ -609,7 +607,7 @@ public class Monster {
         }
     }
 
-    public int getProficiencyBonus(@NotNull ProficiencyType proficiencyType) {
+    public int getProficiencyBonus(@NonNull ProficiencyType proficiencyType) {
         switch (proficiencyType) {
             case PROFICIENT:
                 return getProficiencyBonus();
@@ -753,7 +751,7 @@ public class Monster {
         return abilityDescriptions;
     }
 
-    public String getPlaceholderReplacedText(@NotNull String rawText) {
+    public String getPlaceholderReplacedText(@NonNull String rawText) {
         return rawText
                 .replaceAll("\\[STR SAVE]", String.format("%+d", getSpellSaveDC(AbilityScore.STRENGTH)))
                 .replaceAll("\\[STR ATK]", String.format("%+d", getAttackBonus(AbilityScore.STRENGTH)))
@@ -818,7 +816,7 @@ public class Monster {
     }
 
     @Override
-    public boolean equals(@Nullable @org.jetbrains.annotations.Nullable Object obj) {
+    public boolean equals(@Nullable Object obj) {
         if (obj == null) {
             return false;
         }
diff --git a/app/src/main/java/com/majinnaibu/monstercards/models/SavingThrow.java b/app/src/main/java/com/majinnaibu/monstercards/models/SavingThrow.java
deleted file mode 100644
index 85a2798..0000000
--- a/app/src/main/java/com/majinnaibu/monstercards/models/SavingThrow.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.majinnaibu.monstercards.models;
-
-import java.util.Comparator;
-
-public class SavingThrow implements Comparator<SavingThrow>, Comparable<SavingThrow> {
-
-    private String mName;
-    private int mOrder;
-
-    public SavingThrow(String name, int order) {
-        mName = name;
-        mOrder = order;
-    }
-
-    public String getName() {
-        return mName;
-    }
-
-    public void setName(String value) {
-        mName = value;
-    }
-
-    public int getOrder() {
-        return mOrder;
-    }
-
-    public void setOrder(int value) {
-        mOrder = value;
-    }
-
-    @Override
-    public int compareTo(SavingThrow o) {
-        return Integer.compare(this.getOrder(), o.getOrder());
-    }
-
-    @Override
-    public int compare(SavingThrow o1, SavingThrow o2) {
-        return o1.getOrder() - o2.getOrder();
-    }
-}
diff --git a/app/src/main/java/com/majinnaibu/monstercards/models/Skill.java b/app/src/main/java/com/majinnaibu/monstercards/models/Skill.java
index 9b15f08..9730cc5 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/models/Skill.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/models/Skill.java
@@ -70,7 +70,7 @@ public class Skill implements Comparator<Skill>, Comparable<Skill> {
     }
 
     @Override
-    public boolean equals(@Nullable @org.jetbrains.annotations.Nullable Object obj) {
+    public boolean equals(@Nullable Object obj) {
         if (obj == null) {
             return false;
         }
diff --git a/app/src/main/java/com/majinnaibu/monstercards/models/Trait.java b/app/src/main/java/com/majinnaibu/monstercards/models/Trait.java
index 48d2516..f6a5703 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/models/Trait.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/models/Trait.java
@@ -30,7 +30,7 @@ public class Trait implements Comparator<Trait>, Comparable<Trait> {
     }
 
     @Override
-    public boolean equals(@Nullable @org.jetbrains.annotations.Nullable Object obj) {
+    public boolean equals(@Nullable Object obj) {
         if (obj == null) {
             return false;
         }
diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/collections/CollectionsFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/collections/CollectionsFragment.java
index 1245bcb..a0fd733 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/ui/collections/CollectionsFragment.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/ui/collections/CollectionsFragment.java
@@ -7,8 +7,6 @@ import android.view.ViewGroup;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 
 import com.majinnaibu.monstercards.R;
@@ -23,12 +21,7 @@ public class CollectionsFragment extends MCFragment {
         collectionsViewModel = new ViewModelProvider(this).get(CollectionsViewModel.class);
         View root = inflater.inflate(R.layout.fragment_collections, container, false);
         final TextView textView = root.findViewById(R.id.text_collections);
-        collectionsViewModel.getText().observe(getViewLifecycleOwner(), new Observer<String>() {
-            @Override
-            public void onChanged(@Nullable String s) {
-                textView.setText(s);
-            }
-        });
+        collectionsViewModel.getText().observe(getViewLifecycleOwner(), textView::setText);
         return root;
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/collections/CollectionsViewModel.java b/app/src/main/java/com/majinnaibu/monstercards/ui/collections/CollectionsViewModel.java
index d81c4c5..1ea5b1a 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/ui/collections/CollectionsViewModel.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/ui/collections/CollectionsViewModel.java
@@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModel;
 
 public class CollectionsViewModel extends ViewModel {
 
-    private MutableLiveData<String> mText;
+    private final MutableLiveData<String> mText;
 
     public CollectionsViewModel() {
         mText = new MutableLiveData<>();
diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/components/AbilityScorePicker.java b/app/src/main/java/com/majinnaibu/monstercards/ui/components/AbilityScorePicker.java
index 63111ee..6d15709 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/ui/components/AbilityScorePicker.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/ui/components/AbilityScorePicker.java
@@ -35,11 +35,12 @@ public class AbilityScorePicker extends LinearLayout {
         // TODO: use this as default but allow setting via attribute
         mLabel = "Ability Score";
 
-        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.Stepper, 0, 0);
-        String label = a.getString(R.styleable.Stepper_label);
+        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.AbilityScorePicker, 0, 0);
+        String label = a.getString(R.styleable.AbilityScorePicker_label);
         if (label != null) {
             mLabel = label;
         }
+        a.recycle();
 
         LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
         View root = inflater.inflate(R.layout.component_ability_score_picker, this, true);
@@ -124,7 +125,7 @@ public class AbilityScorePicker extends LinearLayout {
         private final Spinner spinner;
         private final TextView label;
 
-        ViewHolder(View root) {
+        ViewHolder(@NonNull View root) {
             spinner = root.findViewById(R.id.spinner);
             label = root.findViewById(R.id.label);
         }
diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/components/AdvantagePicker.java b/app/src/main/java/com/majinnaibu/monstercards/ui/components/AdvantagePicker.java
index 3bb427f..7ac572f 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/ui/components/AdvantagePicker.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/ui/components/AdvantagePicker.java
@@ -88,7 +88,7 @@ public class AdvantagePicker extends ConstraintLayout {
         final MaterialRadioButton advantage;
         final MaterialRadioButton disadvantage;
 
-        ViewHolder(View root) {
+        ViewHolder(@NonNull View root) {
             group = root.findViewById(R.id.group);
             none = root.findViewById(R.id.hasNoAdvantage);
             advantage = root.findViewById(R.id.hasAdvantage);
diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/components/ProficiencyPicker.java b/app/src/main/java/com/majinnaibu/monstercards/ui/components/ProficiencyPicker.java
index abba324..8b33849 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/ui/components/ProficiencyPicker.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/ui/components/ProficiencyPicker.java
@@ -88,7 +88,7 @@ public class ProficiencyPicker extends ConstraintLayout {
         final MaterialRadioButton proficient;
         final MaterialRadioButton expertise;
 
-        ViewHolder(View root) {
+        ViewHolder(@NonNull View root) {
             group = root.findViewById(R.id.group);
             none = root.findViewById(R.id.none);
             proficient = root.findViewById(R.id.proficient);
diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/components/Stepper.java b/app/src/main/java/com/majinnaibu/monstercards/ui/components/Stepper.java
index fc78071..911a5b9 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/ui/components/Stepper.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/ui/components/Stepper.java
@@ -17,6 +17,7 @@ import com.majinnaibu.monstercards.R;
 import java.util.Objects;
 
 
+@SuppressWarnings("unused")
 public class Stepper extends ConstraintLayout {
     private final ViewHolder mHolder;
     private int mCurrentValue;
@@ -138,7 +139,7 @@ public class Stepper extends ConstraintLayout {
         final Button increment;
         final Button decrement;
 
-        ViewHolder(View root) {
+        ViewHolder(@NonNull View root) {
             text = root.findViewById(R.id.text);
             label = root.findViewById(R.id.label);
             increment = root.findViewById(R.id.increment);
diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/dashboard/DashboardFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/dashboard/DashboardFragment.java
index f2a4ba3..92e61ce 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/ui/dashboard/DashboardFragment.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/ui/dashboard/DashboardFragment.java
@@ -20,12 +20,12 @@ import com.majinnaibu.monstercards.ui.shared.MCFragment;
 import com.majinnaibu.monstercards.utils.Logger;
 
 import java.util.List;
+import java.util.Locale;
 
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 
 public class DashboardFragment extends MCFragment {
-    private static final String MODIFIER_FORMAT = "%+d";
     private DashboardViewModel mViewModel;
     private ViewHolder mHolder;
     private DashboardRecyclerViewAdapter mAdapter;
@@ -42,16 +42,14 @@ public class DashboardFragment extends MCFragment {
                 .getMonsters()
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(monsters -> {
-                    mViewModel.setMonsters(monsters);
-                });
+                .subscribe(monsters -> mViewModel.setMonsters(monsters));
 
         return root;
     }
 
     private void setupRecyclerView(@NonNull RecyclerView recyclerView) {
-        int columnCount = Math.max(1, (int) Math.floor(getResources().getConfiguration().screenWidthDp / 396));
-        Logger.logWTF(String.format("Setting column count to %d", columnCount));
+        int columnCount = Math.max(1, getResources().getConfiguration().screenWidthDp / 396);
+        Logger.logWTF(String.format(Locale.US, "Setting column count to %d", columnCount));
         Context context = requireContext();
         GridLayoutManager layoutManager = new GridLayoutManager(context, columnCount);
         recyclerView.setLayoutManager(layoutManager);
diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/dashboard/DashboardRecyclerViewAdapter.java b/app/src/main/java/com/majinnaibu/monstercards/ui/dashboard/DashboardRecyclerViewAdapter.java
index 6052a66..d6e6149 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/ui/dashboard/DashboardRecyclerViewAdapter.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/ui/dashboard/DashboardRecyclerViewAdapter.java
@@ -11,6 +11,7 @@ import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.ListAdapter;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.majinnaibu.monstercards.R;
 import com.majinnaibu.monstercards.data.enums.AbilityScore;
 import com.majinnaibu.monstercards.data.enums.AdvantageType;
 import com.majinnaibu.monstercards.data.enums.ChallengeRating;
@@ -21,17 +22,17 @@ import com.majinnaibu.monstercards.models.Monster;
 import com.majinnaibu.monstercards.models.Trait;
 import com.majinnaibu.monstercards.utils.Logger;
 
-import org.jetbrains.annotations.NotNull;
+import java.util.Locale;
 
 public class DashboardRecyclerViewAdapter extends ListAdapter<Monster, DashboardRecyclerViewAdapter.ViewHolder> {
     private static final DiffUtil.ItemCallback<Monster> DIFF_CALLBACK = new DiffUtil.ItemCallback<Monster>() {
         @Override
-        public boolean areItemsTheSame(@NonNull @NotNull Monster oldItem, @NonNull @NotNull Monster newItem) {
+        public boolean areItemsTheSame(@NonNull Monster oldItem, @NonNull Monster newItem) {
             return oldItem.id.equals(newItem.id);
         }
 
         @Override
-        public boolean areContentsTheSame(@NonNull @NotNull Monster oldItem, @NonNull @NotNull Monster newItem) {
+        public boolean areContentsTheSame(@NonNull Monster oldItem, @NonNull Monster newItem) {
             return oldItem.equals(newItem);
         }
     };
@@ -43,14 +44,13 @@ public class DashboardRecyclerViewAdapter extends ListAdapter<Monster, Dashboard
     }
 
     @NonNull
-    @NotNull
     @Override
-    public ViewHolder onCreateViewHolder(@NonNull @NotNull ViewGroup parent, int viewType) {
+    public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         return new ViewHolder(CardMonsterBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false));
     }
 
     @Override
-    public void onBindViewHolder(@NonNull @NotNull ViewHolder holder, int position) {
+    public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
         Logger.logUnimplementedMethod();
         Monster monster = getItem(position);
         holder.monster = monster;
@@ -88,7 +88,7 @@ public class DashboardRecyclerViewAdapter extends ListAdapter<Monster, Dashboard
 
         holder.armorClass.setText(String.valueOf(monster.getArmorClassValue()));
         holder.hitPoints.setText(String.valueOf(monster.getHitPointsValue()));
-        holder.challengeRating.setText("CR " + Helpers.getChallengeRatingAbbreviation(monster.challengeRating));
+        holder.challengeRating.setText(holder.challengeRating.getResources().getString(R.string.label_challenge_rating_with_value, Helpers.getChallengeRatingAbbreviation(monster.challengeRating)));
 
         int numActions = monster.actions.size();
         if (numActions > 0) {
@@ -170,7 +170,7 @@ public class DashboardRecyclerViewAdapter extends ListAdapter<Monster, Dashboard
         public final TextView challengeRating;
         public Monster monster;
 
-        public ViewHolder(CardMonsterBinding binding) {
+        public ViewHolder(@NonNull CardMonsterBinding binding) {
             super(binding.getRoot());
             name = binding.name;
             meta = binding.meta;
@@ -214,11 +214,13 @@ public class DashboardRecyclerViewAdapter extends ListAdapter<Monster, Dashboard
     }
 
     public static class Helpers {
+        @NonNull
         public static String getModifierString(int value) {
-            return String.format("%+d", value);
+            return String.format(Locale.getDefault(), "%+d", value);
         }
 
-        public static String getAbilityScoreAbbreviation(AbilityScore abilityScore) {
+        @NonNull
+        public static String getAbilityScoreAbbreviation(@NonNull AbilityScore abilityScore) {
             switch (abilityScore) {
                 case STRENGTH:
                     return "S";
@@ -238,7 +240,8 @@ public class DashboardRecyclerViewAdapter extends ListAdapter<Monster, Dashboard
             }
         }
 
-        public static String getChallengeRatingAbbreviation(ChallengeRating challengeRating) {
+        @NonNull
+        public static String getChallengeRatingAbbreviation(@NonNull ChallengeRating challengeRating) {
             Logger.logUnimplementedMethod();
             switch (challengeRating) {
                 case CUSTOM:
@@ -317,7 +320,8 @@ public class DashboardRecyclerViewAdapter extends ListAdapter<Monster, Dashboard
             }
         }
 
-        public static String getProficiencyAbbreviation(ProficiencyType proficiency) {
+        @NonNull
+        public static String getProficiencyAbbreviation(@NonNull ProficiencyType proficiency) {
             switch (proficiency) {
                 case NONE:
                     return "";
@@ -331,7 +335,8 @@ public class DashboardRecyclerViewAdapter extends ListAdapter<Monster, Dashboard
             }
         }
 
-        public static String getAdvantageAbbreviation(AdvantageType advantage) {
+        @NonNull
+        public static String getAdvantageAbbreviation(@NonNull AdvantageType advantage) {
             switch (advantage) {
                 case NONE:
                     return "";
diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditAbilityScoresFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditAbilityScoresFragment.java
index da53ba2..f22c94d 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditAbilityScoresFragment.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditAbilityScoresFragment.java
@@ -5,6 +5,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.navigation.NavBackStackEntry;
 import androidx.navigation.NavController;
@@ -14,6 +15,8 @@ import com.majinnaibu.monstercards.R;
 import com.majinnaibu.monstercards.ui.components.Stepper;
 import com.majinnaibu.monstercards.ui.shared.MCFragment;
 
+import java.util.Locale;
+
 public class EditAbilityScoresFragment extends MCFragment {
     private final String ABILITY_SCORE_FORMAT = "%d (%+d)";
     private EditMonsterViewModel mViewModel;
@@ -24,7 +27,7 @@ public class EditAbilityScoresFragment extends MCFragment {
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         NavController navController = Navigation.findNavController(requireActivity(), R.id.nav_host_fragment);
         NavBackStackEntry backStackEntry = navController.getBackStackEntry(R.id.edit_monster_navigation);
@@ -34,27 +37,27 @@ public class EditAbilityScoresFragment extends MCFragment {
 
         mViewModel.getStrength().observe(getViewLifecycleOwner(), value -> mHolder.strength.setValue(value));
         mHolder.strength.setOnValueChangeListener((newValue, oldValue) -> mViewModel.setStrength(newValue));
-        mHolder.strength.setOnFormatValueCallback(value -> String.format(ABILITY_SCORE_FORMAT, value, getModifier(value)));
+        mHolder.strength.setOnFormatValueCallback(value -> String.format(Locale.getDefault(), ABILITY_SCORE_FORMAT, value, getModifier(value)));
 
         mViewModel.getDexterity().observe(getViewLifecycleOwner(), value -> mHolder.dexterity.setValue(value));
         mHolder.dexterity.setOnValueChangeListener((newValue, oldValue) -> mViewModel.setDexterity(newValue));
-        mHolder.dexterity.setOnFormatValueCallback(value -> String.format(ABILITY_SCORE_FORMAT, value, getModifier(value)));
+        mHolder.dexterity.setOnFormatValueCallback(value -> String.format(Locale.getDefault(), ABILITY_SCORE_FORMAT, value, getModifier(value)));
 
         mViewModel.getConstitution().observe(getViewLifecycleOwner(), value -> mHolder.constitution.setValue(value));
         mHolder.constitution.setOnValueChangeListener((newValue, oldValue) -> mViewModel.setConstitution(newValue));
-        mHolder.constitution.setOnFormatValueCallback(value -> String.format(ABILITY_SCORE_FORMAT, value, getModifier(value)));
+        mHolder.constitution.setOnFormatValueCallback(value -> String.format(Locale.getDefault(), ABILITY_SCORE_FORMAT, value, getModifier(value)));
 
         mViewModel.getIntelligence().observe(getViewLifecycleOwner(), value -> mHolder.intelligence.setValue(value));
         mHolder.intelligence.setOnValueChangeListener((newValue, oldValue) -> mViewModel.setIntelligence(newValue));
-        mHolder.intelligence.setOnFormatValueCallback(value -> String.format(ABILITY_SCORE_FORMAT, value, getModifier(value)));
+        mHolder.intelligence.setOnFormatValueCallback(value -> String.format(Locale.getDefault(), ABILITY_SCORE_FORMAT, value, getModifier(value)));
 
         mViewModel.getWisdom().observe(getViewLifecycleOwner(), value -> mHolder.wisdom.setValue(value));
         mHolder.wisdom.setOnValueChangeListener((newValue, oldValue) -> mViewModel.setWisdom(newValue));
-        mHolder.wisdom.setOnFormatValueCallback(value -> String.format(ABILITY_SCORE_FORMAT, value, getModifier(value)));
+        mHolder.wisdom.setOnFormatValueCallback(value -> String.format(Locale.getDefault(), ABILITY_SCORE_FORMAT, value, getModifier(value)));
 
         mViewModel.getCharisma().observe(getViewLifecycleOwner(), value -> mHolder.charisma.setValue(value));
         mHolder.charisma.setOnValueChangeListener((newValue, oldValue) -> mViewModel.setCharisma(newValue));
-        mHolder.charisma.setOnFormatValueCallback(value -> String.format(ABILITY_SCORE_FORMAT, value, getModifier(value)));
+        mHolder.charisma.setOnFormatValueCallback(value -> String.format(Locale.getDefault(), ABILITY_SCORE_FORMAT, value, getModifier(value)));
 
         return root;
     }
@@ -67,7 +70,7 @@ public class EditAbilityScoresFragment extends MCFragment {
         final Stepper wisdom;
         final Stepper charisma;
 
-        ViewHolder(View root) {
+        ViewHolder(@NonNull View root) {
             strength = root.findViewById(R.id.strength);
             dexterity = root.findViewById(R.id.dexterity);
             constitution = root.findViewById(R.id.constitution);
diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditArmorFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditArmorFragment.java
index 6abfe4e..a50534e 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditArmorFragment.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditArmorFragment.java
@@ -30,7 +30,7 @@ public class EditArmorFragment extends MCFragment {
     private ViewHolder mHolder;
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         NavController navController = Navigation.findNavController(requireActivity(), R.id.nav_host_fragment);
         NavBackStackEntry backStackEntry = navController.getBackStackEntry(R.id.edit_monster_navigation);
@@ -93,7 +93,7 @@ public class EditArmorFragment extends MCFragment {
         private final Stepper shieldBonus;
         private final EditText customArmor;
 
-        ViewHolder(View root) {
+        ViewHolder(@NonNull View root) {
             armorType = root.findViewById(R.id.armorType);
             naturalArmorBonus = root.findViewById(R.id.naturalArmorBonus);
             hasShield = root.findViewById(R.id.hasShield);
diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditBasicInfoFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditBasicInfoFragment.java
index b2aae02..3fba542 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditBasicInfoFragment.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditBasicInfoFragment.java
@@ -6,6 +6,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.EditText;
 
+import androidx.annotation.NonNull;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.navigation.NavBackStackEntry;
 import androidx.navigation.NavController;
@@ -28,7 +29,7 @@ public class EditBasicInfoFragment extends MCFragment {
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         NavController navController = Navigation.findNavController(requireActivity(), R.id.nav_host_fragment);
         NavBackStackEntry backStackEntry = navController.getBackStackEntry(R.id.edit_monster_navigation);
@@ -73,7 +74,7 @@ public class EditBasicInfoFragment extends MCFragment {
         private final Stepper hitDice;
         private final SwitchMaterial hasCustomHitPoints;
 
-        ViewHolder(View root) {
+        ViewHolder(@NonNull View root) {
             name = root.findViewById(R.id.name);
             size = root.findViewById(R.id.size);
             type = root.findViewById(R.id.type);
diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditChallengeRatingFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditChallengeRatingFragment.java
index 23c1365..33196cd 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditChallengeRatingFragment.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditChallengeRatingFragment.java
@@ -28,7 +28,7 @@ public class EditChallengeRatingFragment extends MCFragment {
     private ViewHolder mHolder;
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         NavController navController = Navigation.findNavController(requireActivity(), R.id.nav_host_fragment);
         NavBackStackEntry backStackEntry = navController.getBackStackEntry(R.id.edit_monster_navigation);
@@ -82,7 +82,7 @@ public class EditChallengeRatingFragment extends MCFragment {
         final EditText customChallengeRatingDescription;
         final EditText customProficiencyBonus;
 
-        ViewHolder(View root) {
+        ViewHolder(@NonNull View root) {
             challengeRating = root.findViewById(R.id.challengeRating);
             customChallengeRatingDescription = root.findViewById(R.id.customChallengeRatingDescription);
             customProficiencyBonus = root.findViewById(R.id.customProficiencyBonus);
diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditLanguageFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditLanguageFragment.java
index 35f258c..bc39d8d 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditLanguageFragment.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditLanguageFragment.java
@@ -44,7 +44,7 @@ public class EditLanguageFragment extends MCFragment {
 
     @Nullable
     @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) {
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         NavController navController = Navigation.findNavController(requireActivity(), R.id.nav_host_fragment);
         NavBackStackEntry backStackEntry = navController.getBackStackEntry(R.id.edit_monster_navigation);
         mEditMonsterViewModel = new ViewModelProvider(backStackEntry).get(EditMonsterViewModel.class);
@@ -80,7 +80,7 @@ public class EditLanguageFragment extends MCFragment {
         EditText name;
         SwitchCompat canSpeak;
 
-        ViewHolder(View root) {
+        ViewHolder(@NonNull View root) {
             name = root.findViewById(R.id.name);
             canSpeak = root.findViewById(R.id.canSpeak);
         }
diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditLanguageViewModel.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditLanguageViewModel.java
index 4a8632e..1b38692 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditLanguageViewModel.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditLanguageViewModel.java
@@ -1,5 +1,6 @@
 package com.majinnaibu.monstercards.ui.editmonster;
 
+import androidx.annotation.NonNull;
 import androidx.lifecycle.LiveData;
 
 import com.majinnaibu.monstercards.models.Language;
@@ -18,7 +19,7 @@ public class EditLanguageViewModel extends ChangeTrackedViewModel {
         mLanguage = new ChangeTrackedLiveData<>(makeLanguage(), this::makeDirty);
     }
 
-    public void copyFromLanguage(Language language) {
+    public void copyFromLanguage(@NonNull Language language) {
         mName.resetValue(language.getName());
         mCanSpeak.resetValue(language.getSpeaks());
         makeClean();
@@ -58,9 +59,10 @@ public class EditLanguageViewModel extends ChangeTrackedViewModel {
         return getCanSpeakValue(false);
     }
 
+    @NonNull
     private Language makeLanguage() {
         Boolean boxedValue = mCanSpeak.getValue();
         boolean canSpeak = boxedValue != null && boxedValue;
         return new Language(mName.getValue(), canSpeak);
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditLanguagesFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditLanguagesFragment.java
index fbc802a..de9d70c 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditLanguagesFragment.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditLanguagesFragment.java
@@ -30,13 +30,13 @@ public class EditLanguagesFragment extends MCFragment {
     private EditMonsterViewModel mViewModel;
     private ViewHolder mHolder;
 
-    private void navigateToEditLanguage(Language language) {
+    private void navigateToEditLanguage(@NonNull Language language) {
         NavDirections action = EditLanguagesFragmentDirections.actionEditLanguagesFragmentToEditLanguageFragment(language.getName(), language.getSpeaks());
         Navigation.findNavController(requireView()).navigate(action);
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         NavController navController = Navigation.findNavController(requireActivity(), R.id.nav_host_fragment);
         NavBackStackEntry backStackEntry = navController.getBackStackEntry(R.id.edit_monster_navigation);
@@ -93,7 +93,7 @@ public class EditLanguagesFragment extends MCFragment {
         RecyclerView list;
         FloatingActionButton addLanguage;
 
-        ViewHolder(View root) {
+        ViewHolder(@NonNull View root) {
             this.list = root.findViewById(R.id.list);
             this.addLanguage = root.findViewById(R.id.add_language);
         }
diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditLanguagesRecyclerViewAdapter.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditLanguagesRecyclerViewAdapter.java
index 662dcd3..e9163c6 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditLanguagesRecyclerViewAdapter.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditLanguagesRecyclerViewAdapter.java
@@ -6,6 +6,7 @@ import android.view.ViewGroup;
 import android.widget.EditText;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.majinnaibu.monstercards.databinding.FragmentEditLanguagesListHeaderBinding;
@@ -13,9 +14,8 @@ import com.majinnaibu.monstercards.databinding.FragmentEditLanguagesListItemBind
 import com.majinnaibu.monstercards.models.Language;
 import com.majinnaibu.monstercards.ui.components.Stepper;
 
-import org.jetbrains.annotations.NotNull;
-
 import java.util.List;
+import java.util.Locale;
 
 public class EditLanguagesRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
     private final List<Language> mValues;
@@ -29,18 +29,18 @@ public class EditLanguagesRecyclerViewAdapter extends RecyclerView.Adapter<Recyc
     private final int ITEM_VIEW_TYPE = 2;
     private final String DISTANCE_IN_FEET_FORMAT = "%d ft.";
 
-    public EditLanguagesRecyclerViewAdapter(List<Language> items, ItemCallback onClick, int telepathyRange, Stepper.OnValueChangeListener telepathyRangeChangedListener, String undderstandsBut, TextWatcher understandsButChangedListener) {
+    public EditLanguagesRecyclerViewAdapter(List<Language> items, ItemCallback onClick, int telepathyRange, Stepper.OnValueChangeListener telepathyRangeChangedListener, String understandsBut, TextWatcher understandsButChangedListener) {
         mValues = items;
         mOnClick = onClick;
         mTelepathyRange = telepathyRange;
         mOnTelepathyRangeChanged = telepathyRangeChangedListener;
-        mUnderstandsBut = undderstandsBut;
+        mUnderstandsBut = understandsBut;
         mOnUnderstandsButChanged = understandsButChangedListener;
     }
 
-    @NotNull
+    @NonNull
     @Override
-    public RecyclerView.ViewHolder onCreateViewHolder(@NotNull ViewGroup parent, int viewType) {
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         if (viewType == HEADER_VIEW_TYPE) {
             return new HeaderViewHolder(FragmentEditLanguagesListHeaderBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false));
         }
@@ -48,10 +48,10 @@ public class EditLanguagesRecyclerViewAdapter extends RecyclerView.Adapter<Recyc
     }
 
     @Override
-    public void onBindViewHolder(@NotNull final RecyclerView.ViewHolder holder, int position) {
+    public void onBindViewHolder(@NonNull final RecyclerView.ViewHolder holder, int position) {
         if (holder instanceof HeaderViewHolder) {
             HeaderViewHolder headerViewHolder = (HeaderViewHolder) holder;
-            headerViewHolder.telepathy.setOnFormatValueCallback(value -> String.format(DISTANCE_IN_FEET_FORMAT, value));
+            headerViewHolder.telepathy.setOnFormatValueCallback(value -> String.format(Locale.getDefault(), DISTANCE_IN_FEET_FORMAT, value));
             headerViewHolder.telepathy.setValue(mTelepathyRange);
             headerViewHolder.telepathy.setOnValueChangeListener(mOnTelepathyRangeChanged);
             headerViewHolder.understandsBut.setText(mUnderstandsBut);
@@ -89,7 +89,7 @@ public class EditLanguagesRecyclerViewAdapter extends RecyclerView.Adapter<Recyc
         public final Stepper telepathy;
         public final EditText understandsBut;
 
-        public HeaderViewHolder(FragmentEditLanguagesListHeaderBinding binding) {
+        public HeaderViewHolder(@NonNull FragmentEditLanguagesListHeaderBinding binding) {
             super(binding.getRoot());
             telepathy = binding.telepathy;
             understandsBut = binding.understandsBut;
@@ -100,12 +100,12 @@ public class EditLanguagesRecyclerViewAdapter extends RecyclerView.Adapter<Recyc
         public final TextView mContentView;
         public Language mItem;
 
-        public ItemViewHolder(FragmentEditLanguagesListItemBinding binding) {
+        public ItemViewHolder(@NonNull FragmentEditLanguagesListItemBinding binding) {
             super(binding.getRoot());
             mContentView = binding.content;
         }
 
-        @NotNull
+        @NonNull
         @Override
         public String toString() {
             return super.toString() + " '" + mContentView.getText() + "'";
diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditMonsterFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditMonsterFragment.java
index c8743b4..0e24067 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditMonsterFragment.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditMonsterFragment.java
@@ -247,7 +247,7 @@ public class EditMonsterFragment extends MCFragment {
         TextView lairActions;
         TextView regionalActions;
 
-        ViewHolder(View root) {
+        ViewHolder(@NonNull View root) {
             basicInfoButton = root.findViewById(R.id.basicInfo);
             armorButton = root.findViewById(R.id.armor);
             speedButton = root.findViewById(R.id.speed);
diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditMonsterViewModel.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditMonsterViewModel.java
index 4812d47..00f76f8 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditMonsterViewModel.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditMonsterViewModel.java
@@ -158,7 +158,7 @@ public class EditMonsterViewModel extends ChangeTrackedViewModel {
         mRegionalActions = new ChangeTrackedLiveData<>(new ArrayList<>(), this::makeDirty);
     }
 
-    public void copyFromMonster(Monster monster) {
+    public void copyFromMonster(@NonNull Monster monster) {
         mMonsterId.resetValue(monster.id);
         mName.resetValue(monster.name);
         mSize.resetValue(monster.size);
@@ -787,7 +787,7 @@ public class EditMonsterViewModel extends ChangeTrackedViewModel {
         return monster;
     }
 
-    public LiveData<List<Trait>> getTraits(TraitType type) {
+    public LiveData<List<Trait>> getTraits(@NonNull TraitType type) {
         switch (type) {
             case ABILITY:
                 return mAbilities;
@@ -807,7 +807,7 @@ public class EditMonsterViewModel extends ChangeTrackedViewModel {
         }
     }
 
-    public void removeTrait(TraitType type, int position) {
+    public void removeTrait(@NonNull TraitType type, int position) {
         switch (type) {
             case ABILITY:
                 Helpers.removeFromList(mAbilities, position);
@@ -833,7 +833,7 @@ public class EditMonsterViewModel extends ChangeTrackedViewModel {
         }
     }
 
-    public void replaceTrait(TraitType type, Trait oldTrait, Trait newTrait) {
+    public void replaceTrait(@NonNull TraitType type, Trait oldTrait, Trait newTrait) {
         switch (type) {
             case ABILITY:
                 Helpers.replaceItemInList(mAbilities, oldTrait, newTrait);
@@ -858,7 +858,7 @@ public class EditMonsterViewModel extends ChangeTrackedViewModel {
         }
     }
 
-    public Trait addNewTrait(TraitType type) {
+    public Trait addNewTrait(@NonNull TraitType type) {
         Trait newAction = new Trait("", "");
         switch (type) {
             case ABILITY:
@@ -879,7 +879,7 @@ public class EditMonsterViewModel extends ChangeTrackedViewModel {
         }
     }
 
-    public LiveData<List<String>> getStrings(StringType type) {
+    public LiveData<List<String>> getStrings(@NonNull StringType type) {
         switch (type) {
             case CONDITION_IMMUNITY:
                 return mConditionImmunities;
@@ -897,7 +897,7 @@ public class EditMonsterViewModel extends ChangeTrackedViewModel {
         }
     }
 
-    public void removeString(StringType type, int position) {
+    public void removeString(@NonNull StringType type, int position) {
         switch (type) {
             case CONDITION_IMMUNITY:
                 Helpers.removeFromList(mConditionImmunities, position);
@@ -920,7 +920,7 @@ public class EditMonsterViewModel extends ChangeTrackedViewModel {
         }
     }
 
-    public String addNewString(StringType type) {
+    public String addNewString(@NonNull StringType type) {
         String newString = "";
         switch (type) {
             case CONDITION_IMMUNITY:
@@ -939,7 +939,7 @@ public class EditMonsterViewModel extends ChangeTrackedViewModel {
         }
     }
 
-    public void replaceString(StringType type, String oldValue, String newValue) {
+    public void replaceString(@NonNull StringType type, String oldValue, String newValue) {
         switch (type) {
             case CONDITION_IMMUNITY:
                 Helpers.replaceItemInList(mConditionImmunities, oldValue, newValue);
@@ -961,7 +961,7 @@ public class EditMonsterViewModel extends ChangeTrackedViewModel {
         }
     }
 
-    public boolean moveTrait(TraitType type, int from, int to) {
+    public boolean moveTrait(@NonNull TraitType type, int from, int to) {
         switch (type) {
             case ABILITY:
                 return Helpers.moveItemInList(mAbilities, from, to);
@@ -989,7 +989,7 @@ public class EditMonsterViewModel extends ChangeTrackedViewModel {
             return addItemToList(listData, newItem, null);
         }
 
-        static <T> T addItemToList(MutableLiveData<List<T>> listData, T newItem, Comparator<? super T> comparator) {
+        static <T> T addItemToList(@NonNull MutableLiveData<List<T>> listData, T newItem, Comparator<? super T> comparator) {
             ArrayList<T> newList = new ArrayList<>(listData.getValue());
             newList.add(newItem);
             if (comparator != null) {
@@ -999,14 +999,14 @@ public class EditMonsterViewModel extends ChangeTrackedViewModel {
             return newItem;
         }
 
-        static <T> void removeFromList(MutableLiveData<List<T>> listData, int position) {
+        static <T> void removeFromList(@NonNull MutableLiveData<List<T>> listData, int position) {
             List<T> oldList = listData.getValue();
             ArrayList<T> newList = new ArrayList<>(oldList);
             newList.remove(position);
             listData.setValue(newList);
         }
 
-        static <T> void replaceItemInList(MutableLiveData<List<T>> listData, int position, T newItem, Comparator<? super T> comparator) {
+        static <T> void replaceItemInList(@NonNull MutableLiveData<List<T>> listData, int position, T newItem, Comparator<? super T> comparator) {
             List<T> oldList = listData.getValue();
             if (oldList == null) {
                 oldList = new ArrayList<>();
@@ -1036,7 +1036,7 @@ public class EditMonsterViewModel extends ChangeTrackedViewModel {
             replaceItemInList(listData, position, newItem, null);
         }
 
-        static <T> void replaceItemInList(MutableLiveData<List<T>> listData, T oldItem, T newItem, Comparator<? super T> comparator) {
+        static <T> void replaceItemInList(@NonNull MutableLiveData<List<T>> listData, T oldItem, T newItem, Comparator<? super T> comparator) {
             List<T> oldList = listData.getValue();
             if (oldList == null) {
                 oldList = new ArrayList<>();
@@ -1071,7 +1071,7 @@ public class EditMonsterViewModel extends ChangeTrackedViewModel {
             return value;
         }
 
-        static <T> boolean moveItemInList(ChangeTrackedLiveData<List<T>> listData, int from, int to) {
+        static <T> boolean moveItemInList(@NonNull ChangeTrackedLiveData<List<T>> listData, int from, int to) {
             List<T> oldList = listData.getValue();
             if (oldList == null) {
                 oldList = new ArrayList<>();
diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSavingThrowsFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSavingThrowsFragment.java
index 7e66172..340e9f5 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSavingThrowsFragment.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSavingThrowsFragment.java
@@ -5,6 +5,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.navigation.NavBackStackEntry;
 import androidx.navigation.NavController;
@@ -20,7 +21,7 @@ public class EditSavingThrowsFragment extends MCFragment {
     private ViewHolder mViewHolder;
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         NavController navController = Navigation.findNavController(requireActivity(), R.id.nav_host_fragment);
         NavBackStackEntry backStackEntry = navController.getBackStackEntry(R.id.edit_monster_navigation);
@@ -75,7 +76,7 @@ public class EditSavingThrowsFragment extends MCFragment {
         AdvantagePicker charismaAdvantage;
         ProficiencyPicker charismaProficiency;
 
-        ViewHolder(View root) {
+        ViewHolder(@NonNull View root) {
             strengthAdvantage = root.findViewById(R.id.strengthAdvantage);
             strengthProficiency = root.findViewById(R.id.strengthProficiency);
             dexterityAdvantage = root.findViewById(R.id.dexterityAdvantage);
diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSkillFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSkillFragment.java
index 9c5ba50..0e5a93e 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSkillFragment.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSkillFragment.java
@@ -89,7 +89,7 @@ public class EditSkillFragment extends MCFragment {
         ProficiencyPicker proficiency;
         EditText name;
 
-        ViewHolder(View root) {
+        ViewHolder(@NonNull View root) {
             abilityScore = root.findViewById(R.id.abilityScore);
             advantage = root.findViewById(R.id.advantage);
             proficiency = root.findViewById(R.id.proficiency);
diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSkillViewModel.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSkillViewModel.java
index b2604dd..dd53c77 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSkillViewModel.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSkillViewModel.java
@@ -1,5 +1,6 @@
 package com.majinnaibu.monstercards.ui.editmonster;
 
+import androidx.annotation.NonNull;
 import androidx.lifecycle.LiveData;
 
 import com.majinnaibu.monstercards.data.enums.AbilityScore;
@@ -25,7 +26,7 @@ public class EditSkillViewModel extends ChangeTrackedViewModel {
         mSkill = new ChangeTrackedLiveData<>(makeSkill(), this::makeDirty);
     }
 
-    public void copyFromSkill(Skill skill) {
+    public void copyFromSkill(@NonNull Skill skill) {
         mAbilityScore.resetValue(skill.abilityScore);
         mAdvantageType.resetValue(skill.advantageType);
         mProficiencyType.resetValue(skill.proficiencyType);
@@ -73,6 +74,7 @@ public class EditSkillViewModel extends ChangeTrackedViewModel {
         mSkill.setValue(makeSkill());
     }
 
+    @NonNull
     private Skill makeSkill() {
         return new Skill(mName.getValue(), mAbilityScore.getValue(), mAdvantageType.getValue(), mProficiencyType.getValue());
     }
diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSkillsFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSkillsFragment.java
index af49bae..e4ccf85 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSkillsFragment.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSkillsFragment.java
@@ -31,13 +31,13 @@ public class EditSkillsFragment extends MCFragment {
     private EditMonsterViewModel mViewModel;
     private ViewHolder mHolder;
 
-    private void navigateToEditSkill(Skill skill) {
+    private void navigateToEditSkill(@NonNull Skill skill) {
         NavDirections action = EditSkillsFragmentDirections.actionEditSkillsFragmentToEditSkillFragment(skill.name, skill.abilityScore, skill.proficiencyType, skill.advantageType);
         Navigation.findNavController(requireView()).navigate(action);
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         NavController navController = Navigation.findNavController(requireActivity(), R.id.nav_host_fragment);
         NavBackStackEntry backStackEntry = navController.getBackStackEntry(R.id.edit_monster_navigation);
@@ -84,7 +84,7 @@ public class EditSkillsFragment extends MCFragment {
         RecyclerView list;
         FloatingActionButton addSkill;
 
-        ViewHolder(View root) {
+        ViewHolder(@NonNull View root) {
             this.list = root.findViewById(R.id.list);
             this.addSkill = root.findViewById(R.id.add_skill);
         }
diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSkillsRecyclerViewAdapter.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSkillsRecyclerViewAdapter.java
index 2c9e87f..f91b8ef 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSkillsRecyclerViewAdapter.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSkillsRecyclerViewAdapter.java
@@ -4,13 +4,12 @@ import android.view.LayoutInflater;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.majinnaibu.monstercards.databinding.FragmentEditSkillsListItemBinding;
 import com.majinnaibu.monstercards.models.Skill;
 
-import org.jetbrains.annotations.NotNull;
-
 import java.util.List;
 
 /**
@@ -25,14 +24,14 @@ public class EditSkillsRecyclerViewAdapter extends RecyclerView.Adapter<EditSkil
         mOnClick = onClick;
     }
 
-    @NotNull
+    @NonNull
     @Override
-    public ViewHolder onCreateViewHolder(@NotNull ViewGroup parent, int viewType) {
+    public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         return new ViewHolder(FragmentEditSkillsListItemBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false));
     }
 
     @Override
-    public void onBindViewHolder(final ViewHolder holder, int position) {
+    public void onBindViewHolder(@NonNull final ViewHolder holder, int position) {
         holder.mItem = mValues.get(position);
         holder.mContentView.setText(mValues.get(position).name);
         holder.itemView.setOnClickListener(v -> {
@@ -55,15 +54,15 @@ public class EditSkillsRecyclerViewAdapter extends RecyclerView.Adapter<EditSkil
         public final TextView mContentView;
         public Skill mItem;
 
-        public ViewHolder(FragmentEditSkillsListItemBinding binding) {
+        public ViewHolder(@NonNull FragmentEditSkillsListItemBinding binding) {
             super(binding.getRoot());
             mContentView = binding.content;
         }
 
-        @NotNull
+        @NonNull
         @Override
         public String toString() {
             return super.toString() + " '" + mContentView.getText() + "'";
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSpeedFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSpeedFragment.java
index 504f132..0893635 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSpeedFragment.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSpeedFragment.java
@@ -6,6 +6,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.EditText;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.widget.SwitchCompat;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.navigation.NavBackStackEntry;
@@ -22,7 +23,7 @@ public class EditSpeedFragment extends MCFragment {
     private ViewHolder mHolder;
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         NavController navController = Navigation.findNavController(requireActivity(), R.id.nav_host_fragment);
         NavBackStackEntry backStackEntry = navController.getBackStackEntry(R.id.edit_monster_navigation);
@@ -74,7 +75,7 @@ public class EditSpeedFragment extends MCFragment {
         final SwitchCompat hasCustomSpeed;
         final EditText customSpeed;
 
-        ViewHolder(View root) {
+        ViewHolder(@NonNull View root) {
             baseSpeed = root.findViewById(R.id.baseSpeed);
             burrowSpeed = root.findViewById(R.id.burrowSpeed);
             climbSpeed = root.findViewById(R.id.climbSpeed);
diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditStringFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditStringFragment.java
index af63b73..54e4ee4 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditStringFragment.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditStringFragment.java
@@ -28,7 +28,7 @@ public class EditStringFragment extends MCFragment {
     private StringType mStringType;
 
     @Override
-    public void onCreate(@Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) {
+    public void onCreate(@Nullable Bundle savedInstanceState) {
         mViewModel = new ViewModelProvider(this).get(EditStringViewModel.class);
         if (getArguments() != null) {
             EditStringFragmentArgs args = EditStringFragmentArgs.fromBundle(getArguments());
@@ -43,7 +43,6 @@ public class EditStringFragment extends MCFragment {
     }
 
     @Nullable
-    @org.jetbrains.annotations.Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         NavController navController = Navigation.findNavController(requireActivity(), R.id.nav_host_fragment);
@@ -69,7 +68,8 @@ public class EditStringFragment extends MCFragment {
         return root;
     }
 
-    private String getTitleForStringType(StringType type) {
+    @NonNull
+    private String getTitleForStringType(@NonNull StringType type) {
         switch (type) {
             case CONDITION_IMMUNITY:
                 return getString(R.string.title_editConditionImmunity);
@@ -95,7 +95,7 @@ public class EditStringFragment extends MCFragment {
     private static class ViewHolder {
         EditText description;
 
-        ViewHolder(View root) {
+        ViewHolder(@NonNull View root) {
             description = root.findViewById(R.id.description);
         }
     }
diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditStringsFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditStringsFragment.java
index 4084bcc..b3bfaa5 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditStringsFragment.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditStringsFragment.java
@@ -26,8 +26,6 @@ import com.majinnaibu.monstercards.ui.shared.MCFragment;
 import com.majinnaibu.monstercards.ui.shared.SwipeToDeleteCallback;
 import com.majinnaibu.monstercards.utils.Logger;
 
-import org.jetbrains.annotations.NotNull;
-
 import java.util.List;
 
 public class EditStringsFragment extends MCFragment {
@@ -36,7 +34,7 @@ public class EditStringsFragment extends MCFragment {
     private StringType mStringType;
 
     @Override
-    public void onCreate(@Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) {
+    public void onCreate(@Nullable Bundle savedInstanceState) {
         Bundle arguments = getArguments();
         if (arguments != null) {
             EditStringsFragmentArgs args = EditStringsFragmentArgs.fromBundle(arguments);
@@ -48,9 +46,8 @@ public class EditStringsFragment extends MCFragment {
     }
 
     @Nullable
-    @org.jetbrains.annotations.Nullable
     @Override
-    public View onCreateView(@NonNull @NotNull LayoutInflater inflater, @Nullable @org.jetbrains.annotations.Nullable ViewGroup container, @Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) {
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         NavController navController = Navigation.findNavController(requireActivity(), R.id.nav_host_fragment);
         NavBackStackEntry backStackEntry = navController.getBackStackEntry(R.id.edit_monster_navigation);
         mViewModel = new ViewModelProvider(backStackEntry).get(EditMonsterViewModel.class);
@@ -62,6 +59,7 @@ public class EditStringsFragment extends MCFragment {
         return root;
     }
 
+    @NonNull
     private String getTitleForStringType(StringType type) {
         switch (type) {
             case CONDITION_IMMUNITY:
@@ -123,7 +121,7 @@ public class EditStringsFragment extends MCFragment {
         RecyclerView list;
         FloatingActionButton addItem;
 
-        ViewHolder(View root) {
+        ViewHolder(@NonNull View root) {
             list = root.findViewById(R.id.list);
             addItem = root.findViewById(R.id.add_item);
         }
diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditStringsRecyclerViewAdapter.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditStringsRecyclerViewAdapter.java
index 5c9ce7b..fda532c 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditStringsRecyclerViewAdapter.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditStringsRecyclerViewAdapter.java
@@ -4,12 +4,11 @@ import android.view.LayoutInflater;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.majinnaibu.monstercards.databinding.FragmentEditStringsListItemBinding;
 
-import org.jetbrains.annotations.NotNull;
-
 import java.util.List;
 
 public class EditStringsRecyclerViewAdapter extends RecyclerView.Adapter<EditStringsRecyclerViewAdapter.ViewHolder> {
@@ -21,14 +20,14 @@ public class EditStringsRecyclerViewAdapter extends RecyclerView.Adapter<EditStr
         mOnClick = onClick;
     }
 
-    @NotNull
+    @NonNull
     @Override
-    public ViewHolder onCreateViewHolder(@NotNull ViewGroup parent, int viewType) {
+    public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         return new ViewHolder(FragmentEditStringsListItemBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false));
     }
 
     @Override
-    public void onBindViewHolder(final ViewHolder holder, int position) {
+    public void onBindViewHolder(@NonNull final ViewHolder holder, int position) {
         holder.mItem = mValues.get(position);
         holder.mContentView.setText(mValues.get(position));
         holder.itemView.setOnClickListener(v -> {
@@ -51,12 +50,12 @@ public class EditStringsRecyclerViewAdapter extends RecyclerView.Adapter<EditStr
         public final TextView mContentView;
         public String mItem;
 
-        public ViewHolder(FragmentEditStringsListItemBinding binding) {
+        public ViewHolder(@NonNull FragmentEditStringsListItemBinding binding) {
             super(binding.getRoot());
             mContentView = binding.content;
         }
 
-        @NotNull
+        @NonNull
         @Override
         public String toString() {
             return super.toString() + " '" + mContentView.getText() + "'";
diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditTraitFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditTraitFragment.java
index f22aa1f..b73ece1 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditTraitFragment.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditTraitFragment.java
@@ -29,7 +29,7 @@ public class EditTraitFragment extends MCFragment {
     private TraitType mTraitType;
 
     @Override
-    public void onCreate(@Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) {
+    public void onCreate(@Nullable Bundle savedInstanceState) {
         mViewModel = new ViewModelProvider(this).get(EditTraitViewModel.class);
         if (getArguments() != null) {
             EditTraitFragmentArgs args = EditTraitFragmentArgs.fromBundle(getArguments());
@@ -44,7 +44,7 @@ public class EditTraitFragment extends MCFragment {
     }
 
     @Nullable
-    @org.jetbrains.annotations.Nullable
+
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         NavController navController = Navigation.findNavController(requireActivity(), R.id.nav_host_fragment);
@@ -102,7 +102,7 @@ public class EditTraitFragment extends MCFragment {
         EditText description;
         EditText name;
 
-        ViewHolder(View root) {
+        ViewHolder(@NonNull View root) {
             description = root.findViewById(R.id.description);
             name = root.findViewById(R.id.name);
         }
diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditTraitViewModel.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditTraitViewModel.java
index 8293160..6d37eb6 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditTraitViewModel.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditTraitViewModel.java
@@ -1,5 +1,6 @@
 package com.majinnaibu.monstercards.ui.editmonster;
 
+import androidx.annotation.NonNull;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 
@@ -49,12 +50,13 @@ public class EditTraitViewModel extends ChangeTrackedViewModel {
         return mAbility.getValue();
     }
 
-    public void copyFromTrait(Trait trait) {
+    public void copyFromTrait(@NonNull Trait trait) {
         makeClean();
         mName.resetValue(trait.name);
         mDescription.resetValue(trait.description);
     }
 
+    @NonNull
     private Trait makeAbility() {
         return new Trait(mName.getValue(), mDescription.getValue());
     }
diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditTraitsFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditTraitsFragment.java
index 293476a..ab6b0de 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditTraitsFragment.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditTraitsFragment.java
@@ -27,8 +27,6 @@ import com.majinnaibu.monstercards.ui.shared.MCFragment;
 import com.majinnaibu.monstercards.ui.shared.SwipeToDeleteCallback;
 import com.majinnaibu.monstercards.utils.Logger;
 
-import org.jetbrains.annotations.NotNull;
-
 import java.util.List;
 
 public class EditTraitsFragment extends MCFragment {
@@ -39,7 +37,7 @@ public class EditTraitsFragment extends MCFragment {
 
 
     @Override
-    public void onCreate(@Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) {
+    public void onCreate(@Nullable Bundle savedInstanceState) {
         if (getArguments() != null) {
             EditTraitsFragmentArgs args = EditTraitsFragmentArgs.fromBundle(getArguments());
             mTraitType = args.getTraitType();
@@ -50,9 +48,8 @@ public class EditTraitsFragment extends MCFragment {
     }
 
     @Nullable
-    @org.jetbrains.annotations.Nullable
     @Override
-    public View onCreateView(@NonNull @NotNull LayoutInflater inflater, @Nullable @org.jetbrains.annotations.Nullable ViewGroup container, @Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) {
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         NavController navController = Navigation.findNavController(requireActivity(), R.id.nav_host_fragment);
         NavBackStackEntry backStackEntry = navController.getBackStackEntry(R.id.edit_monster_navigation);
         mViewModel = new ViewModelProvider(backStackEntry).get(EditMonsterViewModel.class);
@@ -64,6 +61,7 @@ public class EditTraitsFragment extends MCFragment {
         return root;
     }
 
+    @NonNull
     private String getTitleForTraitType(TraitType type) {
         switch (type) {
             case ABILITY:
@@ -116,7 +114,7 @@ public class EditTraitsFragment extends MCFragment {
         });
     }
 
-    protected void navigateToEditTrait(Trait trait) {
+    protected void navigateToEditTrait(@NonNull Trait trait) {
         NavDirections action = EditTraitsFragmentDirections.actionEditTraitListFragmentToEditTraitFragment(trait.description, trait.name, mTraitType);
         Navigation.findNavController(requireView()).navigate(action);
     }
@@ -125,7 +123,7 @@ public class EditTraitsFragment extends MCFragment {
         RecyclerView list;
         FloatingActionButton addTrait;
 
-        ViewHolder(View root) {
+        ViewHolder(@NonNull View root) {
             list = root.findViewById(R.id.list);
             addTrait = root.findViewById(R.id.add_trait);
         }
diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditTraitsRecyclerViewAdapter.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditTraitsRecyclerViewAdapter.java
index b5362c1..b7fc0c6 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditTraitsRecyclerViewAdapter.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditTraitsRecyclerViewAdapter.java
@@ -12,18 +12,16 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.majinnaibu.monstercards.databinding.FragmentEditTraitsListItemBinding;
 import com.majinnaibu.monstercards.models.Trait;
 
-import org.jetbrains.annotations.NotNull;
-
 public class EditTraitsRecyclerViewAdapter extends ListAdapter<Trait, EditTraitsRecyclerViewAdapter.ViewHolder> {
     private static final DiffUtil.ItemCallback<Trait> DIFF_CALLBACK = new DiffUtil.ItemCallback<Trait>() {
 
         @Override
-        public boolean areItemsTheSame(@NonNull @NotNull Trait oldItem, @NonNull @NotNull Trait newItem) {
+        public boolean areItemsTheSame(@NonNull Trait oldItem, @NonNull Trait newItem) {
             return oldItem.equals(newItem);
         }
 
         @Override
-        public boolean areContentsTheSame(@NonNull @NotNull Trait oldItem, @NonNull @NotNull Trait newItem) {
+        public boolean areContentsTheSame(@NonNull Trait oldItem, @NonNull Trait newItem) {
             return oldItem.equals(newItem);
         }
     };
@@ -34,14 +32,14 @@ public class EditTraitsRecyclerViewAdapter extends ListAdapter<Trait, EditTraits
         mOnClick = onClick;
     }
 
-    @NotNull
+    @NonNull
     @Override
-    public ViewHolder onCreateViewHolder(@NotNull ViewGroup parent, int viewType) {
+    public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         return new ViewHolder(FragmentEditTraitsListItemBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false));
     }
 
     @Override
-    public void onBindViewHolder(final ViewHolder holder, int position) {
+    public void onBindViewHolder(@NonNull final ViewHolder holder, int position) {
         holder.mItem = getItem(position);
         holder.mContentView.setText(holder.mItem.name);
         holder.itemView.setOnClickListener(v -> {
@@ -59,12 +57,12 @@ public class EditTraitsRecyclerViewAdapter extends ListAdapter<Trait, EditTraits
         public final TextView mContentView;
         public Trait mItem;
 
-        public ViewHolder(FragmentEditTraitsListItemBinding binding) {
+        public ViewHolder(@NonNull FragmentEditTraitsListItemBinding binding) {
             super(binding.getRoot());
             mContentView = binding.content;
         }
 
-        @NotNull
+        @NonNull
         @Override
         public String toString() {
             return super.toString() + " '" + mContentView.getText() + "'";
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 51f7e1f..0499a93 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
@@ -114,7 +114,7 @@ public class LibraryFragment extends MCFragment {
         });
     }
 
-    protected void navigateToMonsterDetail(UUID monsterId) {
+    protected void navigateToMonsterDetail(@NonNull UUID monsterId) {
         NavDirections action = LibraryFragmentDirections.actionNavigationLibraryToNavigationMonster(monsterId.toString());
         Navigation.findNavController(requireView()).navigate(action);
     }
diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/library/LibraryRecyclerViewAdapter.java b/app/src/main/java/com/majinnaibu/monstercards/ui/library/LibraryRecyclerViewAdapter.java
index 6b20d59..82a80da 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/ui/library/LibraryRecyclerViewAdapter.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/ui/library/LibraryRecyclerViewAdapter.java
@@ -27,7 +27,7 @@ public class LibraryRecyclerViewAdapter extends RecyclerView.Adapter<LibraryRecy
     private final Flowable<List<Monster>> mItemsObservable;
     private final View.OnClickListener mOnClickListener = new View.OnClickListener() {
         @Override
-        public void onClick(View view) {
+        public void onClick(@NonNull View view) {
             Monster monster = (Monster) view.getTag();
             if (mOnClick != null) {
                 mOnClick.onItemCallback(monster);
diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterDetailFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterDetailFragment.java
index 9968ce0..f910dfa 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterDetailFragment.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterDetailFragment.java
@@ -99,7 +99,7 @@ public class MonsterDetailFragment extends MCFragment {
         return root;
     }
 
-    private void setupLabeledTextView(TextView view, String text, int titleId) {
+    private void setupLabeledTextView(@NonNull TextView view, String text, int titleId) {
         String title = getString(titleId);
         String fullText = String.format("<b>%s</b> %s", title, text);
         view.setText(Html.fromHtml(fullText));
@@ -214,7 +214,7 @@ public class MonsterDetailFragment extends MCFragment {
         final TextView regionalEffects_label;
         final ImageView regionalEffects_divider;
 
-        ViewHolder(View root) {
+        ViewHolder(@NonNull View root) {
             name = root.findViewById(R.id.name);
             meta = root.findViewById(R.id.meta);
             armorClass = root.findViewById(R.id.armorClass);
diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterDetailViewModel.java b/app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterDetailViewModel.java
index a91a5f9..38e5d13 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterDetailViewModel.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterDetailViewModel.java
@@ -1,5 +1,6 @@
 package com.majinnaibu.monstercards.ui.monster;
 
+import androidx.annotation.NonNull;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
@@ -180,7 +181,7 @@ public class MonsterDetailViewModel extends ViewModel {
         return mMonsterId;
     }
 
-    public void setMonster(Monster monster) {
+    public void setMonster(@NonNull Monster monster) {
         mMonster = monster;
         mAbilities.setValue(mMonster.getAbilityDescriptions());
         mActions.setValue(mMonster.getActionDescriptions());
diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterImportFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterImportFragment.java
index edb973c..a4912f7 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterImportFragment.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterImportFragment.java
@@ -88,7 +88,7 @@ public class MonsterImportFragment extends MCFragment {
         return root;
     }
 
-    private void setupLabeledTextView(TextView view, String text, int titleId) {
+    private void setupLabeledTextView(@NonNull TextView view, String text, int titleId) {
         String title = getString(titleId);
         String fullText = String.format("<b>%s</b> %s", title, text);
         view.setText(Html.fromHtml(fullText));
@@ -184,7 +184,7 @@ public class MonsterImportFragment extends MCFragment {
         return super.onOptionsItemSelected(item);
     }
 
-    private void navigateToEditMonster(UUID monsterId) {
+    private void navigateToEditMonster(@NonNull UUID monsterId) {
         NavController navController = Navigation.findNavController(requireView());
         NavDirections action;
         action = MonsterImportFragmentDirections.actionMonsterImportFragmentToNavigationLibrary();
@@ -234,7 +234,7 @@ public class MonsterImportFragment extends MCFragment {
         final TextView regionalEffects_label;
         final ImageView regionalEffects_divider;
 
-        ViewHolder(View root) {
+        ViewHolder(@NonNull View root) {
             this.root = root;
             name = root.findViewById(R.id.name);
             meta = root.findViewById(R.id.meta);
diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterImportViewModel.java b/app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterImportViewModel.java
index 31e1a80..ae13d15 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterImportViewModel.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterImportViewModel.java
@@ -1,5 +1,6 @@
 package com.majinnaibu.monstercards.ui.monster;
 
+import androidx.annotation.NonNull;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
@@ -183,7 +184,7 @@ public class MonsterImportViewModel extends ViewModel {
         return mMonster;
     }
 
-    public void setMonster(Monster monster) {
+    public void setMonster(@NonNull Monster monster) {
         mMonster = monster;
         mAbilities.setValue(mMonster.getAbilityDescriptions());
         mActions.setValue(mMonster.getActionDescriptions());
diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/search/SearchResultsRecyclerViewAdapter.java b/app/src/main/java/com/majinnaibu/monstercards/ui/search/SearchResultsRecyclerViewAdapter.java
index 9e11992..93c546a 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/ui/search/SearchResultsRecyclerViewAdapter.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/ui/search/SearchResultsRecyclerViewAdapter.java
@@ -13,8 +13,6 @@ import com.majinnaibu.monstercards.data.MonsterRepository;
 import com.majinnaibu.monstercards.models.Monster;
 import com.majinnaibu.monstercards.utils.Logger;
 
-import org.jetbrains.annotations.NotNull;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -52,7 +50,7 @@ public class SearchResultsRecyclerViewAdapter extends RecyclerView.Adapter<Searc
                 throwable -> Logger.logError("Error performing search", throwable));
     }
 
-    @NotNull
+    @NonNull
     @Override
     public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         View view = LayoutInflater.from(parent.getContext())
@@ -61,7 +59,7 @@ public class SearchResultsRecyclerViewAdapter extends RecyclerView.Adapter<Searc
     }
 
     @Override
-    public void onBindViewHolder(final ViewHolder holder, int position) {
+    public void onBindViewHolder(@NonNull final ViewHolder holder, int position) {
         Monster monster = mValues.get(position);
         holder.mContentView.setText(monster.name);
         holder.itemView.setTag(monster);
diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/shared/SwipeToDeleteCallback.java b/app/src/main/java/com/majinnaibu/monstercards/ui/shared/SwipeToDeleteCallback.java
index c333a44..4fd376c 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/ui/shared/SwipeToDeleteCallback.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/ui/shared/SwipeToDeleteCallback.java
@@ -25,7 +25,7 @@ public class SwipeToDeleteCallback extends ItemTouchHelper.SimpleCallback {
     private final OnMoveCallback mOnMove;
     private final Context mContext;
 
-    public SwipeToDeleteCallback(Context context, OnSwipeCallback onDelete, OnMoveCallback onMove) {
+    public SwipeToDeleteCallback(@NonNull Context context, OnSwipeCallback onDelete, OnMoveCallback onMove) {
         super(onMove == null ? 0 : ItemTouchHelper.UP | ItemTouchHelper.DOWN, onDelete == null ? 0 : ItemTouchHelper.LEFT);
         mOnDelete = onDelete;
         mOnMove = onMove;
diff --git a/app/src/main/java/com/majinnaibu/monstercards/utils/ChangeTrackedLiveData.java b/app/src/main/java/com/majinnaibu/monstercards/utils/ChangeTrackedLiveData.java
index d9440bd..01a2a0d 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/utils/ChangeTrackedLiveData.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/utils/ChangeTrackedLiveData.java
@@ -4,6 +4,7 @@ import androidx.lifecycle.MutableLiveData;
 
 import java.util.Objects;
 
+@SuppressWarnings("unused")
 public class ChangeTrackedLiveData<T> extends MutableLiveData<T> {
     private final OnValueChangedCallback<T> mOnValueChangedCallback;
     private final OnValueDirtiedCallback mOnValueDirtiedCallback;
diff --git a/app/src/main/java/com/majinnaibu/monstercards/utils/Logger.java b/app/src/main/java/com/majinnaibu/monstercards/utils/Logger.java
index 622f141..535b0d1 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/utils/Logger.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/utils/Logger.java
@@ -2,6 +2,7 @@ package com.majinnaibu.monstercards.utils;
 
 import android.util.Log;
 
+@SuppressWarnings("unused")
 public class Logger {
     public static final String LOG_TAG = "MonsterCards";
 
@@ -37,7 +38,7 @@ public class Logger {
         StackTraceElement stackTraceElement = throwable.getStackTrace()[0];
 
         String location = stackTraceElement.getClassName() + "." + stackTraceElement.getMethodName() + ":" + stackTraceElement.getLineNumber();
-        String message = String.format("Unexpected error occured at %s.", location);
+        String message = String.format("Unexpected error occurred at %s.", location);
         Log.wtf(LOG_TAG, message, throwable);
     }
 
@@ -55,7 +56,7 @@ public class Logger {
         StackTraceElement stackTraceElement = throwable.getStackTrace()[0];
 
         String location = stackTraceElement.getClassName() + "." + stackTraceElement.getMethodName() + ":" + stackTraceElement.getLineNumber();
-        String message = String.format("Unexpected error occured at %s.", location);
+        String message = String.format("Unexpected error occurred at %s.", location);
         Log.e(LOG_TAG, message, throwable);
     }
 
@@ -73,7 +74,7 @@ public class Logger {
         StackTraceElement stackTraceElement = throwable.getStackTrace()[0];
 
         String location = stackTraceElement.getClassName() + "." + stackTraceElement.getMethodName() + ":" + stackTraceElement.getLineNumber();
-        String message = String.format("Unexpected error occured at %s.", location);
+        String message = String.format("Unexpected error occurred at %s.", location);
         Log.w(LOG_TAG, message, throwable);
     }
 
@@ -91,7 +92,7 @@ public class Logger {
         StackTraceElement stackTraceElement = throwable.getStackTrace()[0];
 
         String location = stackTraceElement.getClassName() + "." + stackTraceElement.getMethodName() + ":" + stackTraceElement.getLineNumber();
-        String message = String.format("Unexpected error occured at %s.", location);
+        String message = String.format("Unexpected error occurred at %s.", location);
         Log.i(LOG_TAG, message, throwable);
     }
 
@@ -109,7 +110,7 @@ public class Logger {
         StackTraceElement stackTraceElement = throwable.getStackTrace()[0];
 
         String location = stackTraceElement.getClassName() + "." + stackTraceElement.getMethodName() + ":" + stackTraceElement.getLineNumber();
-        String message = String.format("Unexpected error occured at %s.", location);
+        String message = String.format("Unexpected error occurred at %s.", location);
         Log.d(LOG_TAG, message, throwable);
     }
 
@@ -127,7 +128,7 @@ public class Logger {
         StackTraceElement stackTraceElement = throwable.getStackTrace()[0];
 
         String location = stackTraceElement.getClassName() + "." + stackTraceElement.getMethodName() + ":" + stackTraceElement.getLineNumber();
-        String message = String.format("Unexpected error occured at %s.", location);
+        String message = String.format("Unexpected error occurred at %s.", location);
         Log.v(LOG_TAG, message, throwable);
     }
 
diff --git a/app/src/main/java/com/majinnaibu/monstercards/utils/TextChangedListener.java b/app/src/main/java/com/majinnaibu/monstercards/utils/TextChangedListener.java
index 5f3cbbd..8034dd3 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/utils/TextChangedListener.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/utils/TextChangedListener.java
@@ -3,6 +3,7 @@ package com.majinnaibu.monstercards.utils;
 import android.text.Editable;
 import android.text.TextWatcher;
 
+@SuppressWarnings("unused")
 public class TextChangedListener implements TextWatcher {
 
     private final BeforeTextChangedCallback mBeforeTextChangedCallback;
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 32679d2..3cb13c9 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <attr name="label" format="string" localization="suggested" />
+
     <declare-styleable name="Stepper">
         <attr name="stepAmount" format="integer" />
         <attr name="minValue" format="integer" />
         <attr name="maxValue" format="integer" />
-        <attr name="label" format="string" localization="suggested" />
+        <attr name="label" />
     </declare-styleable>
-</resources>
\ No newline at end of file
+    <declare-styleable name="AbilityScorePicker">
+        <attr name="label" />
+    </declare-styleable>
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2922318..a03db83 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -34,6 +34,7 @@
     <string name="label_can_hover">Can Hover</string>
     <string name="label_can_speak_language">Can Speak</string>
     <string name="label_challenge_rating">Challenge Rating</string>
+    <string name="label_challenge_rating_with_value">CR %s</string>
     <string name="label_challengeRating_icon">CR</string>
     <string name="label_charisma">Charisma</string>
     <string name="label_climb_speed">Climb Speed</string>