diff --git a/app/src/main/java/io/github/sspanak/tt9/db/entities/WordFile.java b/app/src/main/java/io/github/sspanak/tt9/db/entities/WordFile.java
index 6d974cfd..80b06e94 100644
--- a/app/src/main/java/io/github/sspanak/tt9/db/entities/WordFile.java
+++ b/app/src/main/java/io/github/sspanak/tt9/db/entities/WordFile.java
@@ -10,6 +10,7 @@ import java.io.InputStreamReader;
 import java.net.URL;
 import java.net.URLConnection;
 import java.nio.charset.StandardCharsets;
+import java.util.Locale;
 
 import io.github.sspanak.tt9.R;
 import io.github.sspanak.tt9.preferences.settings.SettingsStore;
@@ -138,6 +139,15 @@ public class WordFile {
 	}
 
 
+	public String getFormattedTotalLines(String suffix) {
+		if (getTotalLines() > 1000000) {
+			return String.format(Locale.ROOT, "%1.2fM %s", getTotalLines() / 1000000.0, suffix);
+		} else {
+			return getTotalLines() / 1000 + "k " + suffix;
+		}
+	}
+
+
 	private void setTotalLines(String rawProperty, String rawValue) {
 		if (!rawProperty.equals("words")) {
 			return;
@@ -161,6 +171,11 @@ public class WordFile {
 	}
 
 
+	public String getFormattedSize() {
+		return String.format(Locale.ROOT, "%1.2f Mb", getSize() / 1048576.0);
+	}
+
+
 	private void setSize(String rawProperty, String rawValue) {
 		if (!rawProperty.equals("size")) {
 			return;
diff --git a/app/src/main/java/io/github/sspanak/tt9/db/wordPairs/WordPairStore.java b/app/src/main/java/io/github/sspanak/tt9/db/wordPairs/WordPairStore.java
index c419ab1d..7d7488ce 100644
--- a/app/src/main/java/io/github/sspanak/tt9/db/wordPairs/WordPairStore.java
+++ b/app/src/main/java/io/github/sspanak/tt9/db/wordPairs/WordPairStore.java
@@ -198,7 +198,4 @@ public class WordPairStore extends BaseSyncStore {
 
 		return sb.toString();
 	}
-
-
-
 }
diff --git a/app/src/main/java/io/github/sspanak/tt9/ime/helpers/InputModeValidator.java b/app/src/main/java/io/github/sspanak/tt9/ime/helpers/InputModeValidator.java
index 3ba846cb..923348a2 100644
--- a/app/src/main/java/io/github/sspanak/tt9/ime/helpers/InputModeValidator.java
+++ b/app/src/main/java/io/github/sspanak/tt9/ime/helpers/InputModeValidator.java
@@ -34,7 +34,7 @@ public class InputModeValidator {
 		Language validLanguage = LanguageCollection.getLanguage(context, validLanguageIds.get(0));
 		validLanguage = validLanguage != null ? validLanguage : LanguageCollection.getDefault(context);
 
-		Logger.w("validateLanguage", error + " Enforcing language: " + validLanguage.getId());
+		Logger.d("validateLanguage", error + " Enforcing language: " + validLanguage.getId());
 
 		return validLanguage;
 	}
@@ -51,7 +51,7 @@ public class InputModeValidator {
 		}
 
 		if (newModeId != oldModeId) {
-			Logger.w("validateMode", "Invalid input mode: " + oldModeId + " Enforcing: " + newModeId);
+			Logger.d("validateMode", "Invalid input mode: " + oldModeId + " Enforcing: " + newModeId);
 		}
 
 		return newModeId;
diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/deleteWords/PreferenceSearchWords.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/deleteWords/PreferenceSearchWords.java
index f9a3ea83..ffbf66d5 100644
--- a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/deleteWords/PreferenceSearchWords.java
+++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/deleteWords/PreferenceSearchWords.java
@@ -20,7 +20,6 @@ public class PreferenceSearchWords extends ItemTextInput {
 
 	private ConsumerCompat<ArrayList<String>> onWords;
 	private ConsumerCompat<Long> onTotalWords;
-	private SettingsStore settings;
 
 	@NonNull private String lastSearchTerm = "";
 
diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/languageSelection/PreferenceSwitchLanguage.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/languageSelection/PreferenceSwitchLanguage.java
index ccf12ae7..953f24bf 100644
--- a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/languageSelection/PreferenceSwitchLanguage.java
+++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/languageSelection/PreferenceSwitchLanguage.java
@@ -44,21 +44,20 @@ public class PreferenceSwitchLanguage extends SwitchPreferenceCompat {
 
 
 	private String generateSummary(Activity activity, NaturalLanguage language) {
-		String summary = language.getLocale().getDisplayLanguage();
+		StringBuilder summary = new StringBuilder(language.getLocale().getDisplayLanguage());
 
-		String wordsString = activity.getString(R.string.language_selection_words);
 		WordFile wordFile = new WordFile(activity, language.getDictionaryFile(), activity.getAssets());
-		if (wordFile.getTotalLines() > 1000000) {
-			summary += String.format(", %1.2fM %s", wordFile.getTotalLines() / 1000000.0, wordsString);
-		} else {
-			summary += ", " + wordFile.getTotalLines() / 1000 + "k " + wordsString;
-		}
+		summary
+			.append(", ")
+			.append(
+			wordFile.getFormattedTotalLines(activity.getString(R.string.language_selection_words))
+		);
 
 		if (BuildConfig.LITE) {
-			summary += String.format(", %1.2f Mb", wordFile.getSize() / 1048576.0);
+			summary.append(", ").append(wordFile.getFormattedSize());
 		}
 
-		return summary;
+		return summary.toString();
 	}
 
 
diff --git a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SwipeableKey.java b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SwipeableKey.java
index 8a63214c..2ba886e0 100644
--- a/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SwipeableKey.java
+++ b/app/src/main/java/io/github/sspanak/tt9/ui/main/keys/SwipeableKey.java
@@ -16,7 +16,7 @@ abstract public class SwipeableKey extends SoftKey {
 	private boolean isHolding = false;
 	private boolean isSwipingX = false;
 	private boolean isSwipingY = false;
-	private boolean hasSwiped = false;
+	private boolean notSwiped = false;
 
 	private float startX;
 	private float startY;
@@ -124,7 +124,7 @@ abstract public class SwipeableKey extends SoftKey {
 
 
 	private void onRelease(MotionEvent event) {
-		hasSwiped = !isSwipingY && !isSwipingX;
+		notSwiped = !isSwipingY && !isSwipingX;
 
 		if (isSwipingY) {
 			isSwipingY = false;
@@ -142,5 +142,5 @@ abstract public class SwipeableKey extends SoftKey {
 	protected void handleSwipeY(float position, float delta) {}
 	protected void handleEndSwipeX(float position, float delta) {}
 	protected void handleEndSwipeY(float position, float delta) {}
-	protected boolean notSwiped() { return hasSwiped; }
+	protected boolean notSwiped() { return notSwiped; }
 }