diff --git a/app/src/main/java/com/zeevox/octo/core/Ocquarium.java b/app/src/main/java/com/zeevox/octo/core/Ocquarium.java
index 7a31ef3..3cb1666 100644
--- a/app/src/main/java/com/zeevox/octo/core/Ocquarium.java
+++ b/app/src/main/java/com/zeevox/octo/core/Ocquarium.java
@@ -55,7 +55,7 @@ public static void start(
     final float dp = resources.getDisplayMetrics().density;
 
     // Set the background to be the gradient with user defined colors
-    // See bgGradient(ContextWrapper, Resources) for more info about this
+    // See bgGradient(ContextWrapper, Resources) for more information about this
     window.setBackgroundDrawable(bgGradient(context, resources));
 
     // Hide the navigation bar if set by the user
@@ -89,8 +89,8 @@ public static void start(
 
     /* START Settings button */
     if (showSettingsButton) {
-      ImageButton mImageButton = new ImageButton(context);
-      mImageButton =
+      new ImageButton(context);
+      ImageButton mImageButton =
           (ImageButton)
               LayoutInflater.from(context).inflate(R.layout.ocquarium_settings_button, bg, false);
       // Set a transparent icon if user set in preferences
@@ -155,7 +155,7 @@ public static GradientDrawable bgGradient(ContextWrapper context, Resources reso
     SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
     // Recreate octo_bg.xml programmatically
     GradientDrawable backgroundGradient = new GradientDrawable();
-    // Set the background colors / fetch them from the preferences menu
+    // Set the background colors / fetch them from the user's preferences
     backgroundGradient.setColors(
         new int[] {
           preferences.getInt(
diff --git a/app/src/main/java/com/zeevox/octo/core/OctopusDrawable.java b/app/src/main/java/com/zeevox/octo/core/OctopusDrawable.java
index 26c6753..35adbfa 100644
--- a/app/src/main/java/com/zeevox/octo/core/OctopusDrawable.java
+++ b/app/src/main/java/com/zeevox/octo/core/OctopusDrawable.java
@@ -317,7 +317,7 @@ public int getOpacity() {
     return PixelFormat.TRANSLUCENT;
   }
 
-  private class Link // he come to town
+  private class Link // he comes to town
       implements DynamicAnimation.OnAnimationUpdateListener {
 
     final FloatValueHolder[] coords = new FloatValueHolder[2];
diff --git a/app/src/main/java/com/zeevox/octo/settings/SettingsActivityV2.java b/app/src/main/java/com/zeevox/octo/settings/SettingsActivityV2.java
index 78d565f..c6217bf 100644
--- a/app/src/main/java/com/zeevox/octo/settings/SettingsActivityV2.java
+++ b/app/src/main/java/com/zeevox/octo/settings/SettingsActivityV2.java
@@ -65,7 +65,7 @@
 /**
  * A {@link PreferenceActivity} that presents a set of application settings. On handset devices,
  * settings are presented as a single list. On tablets, settings are split by category, with
- * category headers shown to the left of the list of settings.
+ * category headers shown in a panel on the left.
  *
  * <p>See <a href="http://developer.android.com/design/patterns/settings.html">Android Design:
  * Settings</a> for design guidelines and the <a
@@ -131,7 +131,7 @@ protected void onCreate(Bundle savedInstanceState) {
   }
 
   @Override
-  public boolean onPreferenceStartScreen(PreferenceFragmentCompat caller, PreferenceScreen pref) {
+  public boolean onPreferenceStartScreen(@NonNull PreferenceFragmentCompat caller, PreferenceScreen pref) {
     Bundle args = new Bundle();
     args.putString(PreferenceFragmentCompat.ARG_PREFERENCE_ROOT, pref.getKey());
 
@@ -143,7 +143,7 @@ public boolean onPreferenceStartScreen(PreferenceFragmentCompat caller, Preferen
   }
 
   @Override
-  public boolean onPreferenceStartFragment(PreferenceFragmentCompat caller, Preference pref) {
+  public boolean onPreferenceStartFragment(@NonNull PreferenceFragmentCompat caller, Preference pref) {
     if (!isValidFragment(pref.getFragment())) return false;
     Fragment fragment = Fragment.instantiate(this, pref.getFragment(), pref.getExtras());
     fragment.setTargetFragment(caller, 0);
@@ -315,7 +315,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
           .setOnPreferenceClickListener(
               new Preference.OnPreferenceClickListener() {
                 @Override
-                public boolean onPreferenceClick(Preference preference) {
+                public boolean onPreferenceClick(@NonNull Preference preference) {
                   final String[][] randomGradientDetails = {
                       ColorUtils.getGradientDetails(getRandomInt(ColorUtils.gradients.size()))
                   };
@@ -356,7 +356,7 @@ private int getRandomInt(int max) {
     }
 
     @Override
-    public void onDisplayPreferenceDialog(Preference preference) {
+    public void onDisplayPreferenceDialog(@NonNull Preference preference) {
       if (preference instanceof ColorPreference) {
         ((ColorPreference) preference).showDialog(this, 0);
       } else super.onDisplayPreferenceDialog(preference);
@@ -382,7 +382,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
     }
 
     @Override
-    public boolean onPreferenceStartFragment(PreferenceFragmentCompat caller, Preference pref) {
+    public boolean onPreferenceStartFragment(@NonNull PreferenceFragmentCompat caller, Preference pref) {
       if (pref.getFragment().equals(OctopusFragmentV2.class.getName())) {
         Fragment fragment = Fragment.instantiate(caller.getActivity(), pref.getFragment(), pref.getExtras());
         fragment.setTargetFragment(caller, 0);
@@ -544,7 +544,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
           Integer.parseInt(preferences.getString("octopus_average_size", "110"));
 
       // Set the background to be the gradient with user defined colors
-      // See bgGradient(ContextWrapper, Resources) for more info about this
+      // See bgGradient(ContextWrapper, Resources) for more information about this
       requireView()
           .findViewById(R.id.prefs_octopus_bg)
           .setBackground(Ocquarium.bgGradient(getActivity(), getResources()));
diff --git a/app/src/main/java/com/zeevox/octo/wallpaper/LiveWallpaperService.java b/app/src/main/java/com/zeevox/octo/wallpaper/LiveWallpaperService.java
index 7517d30..49ea575 100644
--- a/app/src/main/java/com/zeevox/octo/wallpaper/LiveWallpaperService.java
+++ b/app/src/main/java/com/zeevox/octo/wallpaper/LiveWallpaperService.java
@@ -100,7 +100,7 @@ public void onSurfaceCreated(SurfaceHolder holder) {
     protected abstract void drawFrame();
 
     protected void iteration() {
-      // Reschedule the next redraw in 40ms
+      // Reschedule the next redrawing in 40ms
       mHandler.removeCallbacks(mIteration);
       if (mVisible) {
         mHandler.postDelayed(mIteration, 1000 / 25);
diff --git a/app/src/main/res/layout/pref_octopus.xml b/app/src/main/res/layout/pref_octopus.xml
index da486d1..b97e24b 100644
--- a/app/src/main/res/layout/pref_octopus.xml
+++ b/app/src/main/res/layout/pref_octopus.xml
@@ -39,7 +39,7 @@
         android:paddingEnd="16dp"
         android:paddingBottom="48dp"
         android:orientation="vertical">
-        <!-- Higher bottom padding so user doesn't tap navbar instead of seekbar accidentally -->
+        <!-- Higher bottom padding so that the user does not tap navbar instead of seekbar accidentally -->
 
         <TextView
             android:layout_width="match_parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8696857..d8fd60b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -19,7 +19,7 @@
     <string name="about_action_alpha">Test alpha builds</string>
     <string name="about_action_email">Send an email</string>
     <string name="about_action_email_error">There are no email clients installed.</string>
-    <string name="about_action_email_text">Hello there,    I\'d like to…</string>
+    <string name="about_action_email_text">To the Ocquarium developers,\n\n</string>
     <string name="about_action_email_title">Ocquarium question</string>
     <string name="about_action_g_play">Write a review</string>
     <string name="about_action_github">View source code</string>
@@ -122,7 +122,7 @@
     <string name="prefs_restarting_wallpaper">Restarting live wallpaper…</string>
     <string name="prefs_screensaver_enable_touch_summary">Allow moving the octopus by touch during screensaver mode</string>
     <string name="prefs_screensaver_enable_touch_title">Enable touch</string>
-    <string name="prefs_screensaver_error">Your device doesn\'t support setting a screensaver, sorry.</string>
+    <string name="prefs_screensaver_error">Unfortunately, our device does not support setting a screensaver.</string>
     <string name="prefs_set_live_wall_summary">Click me to set Ocquarium as your live wallpaper.</string>
     <string name="prefs_set_live_wall_title">Set live wallpaper</string>
     <string name="prefs_set_screensaver_summary">Click me to set Ocquarium as your device\'s screensaver.</string>
@@ -131,7 +131,7 @@
     <string name="prefs_show_navigation_bar_title">Show system navbar</string>
     <string name="prefs_show_platlogo_summary">Display the Android Oreo logo before the octopus.</string>
     <string name="prefs_show_platlogo_title">Show platform logo</string>
-    <string name="prefs_uigradients_dialog_description">Apply gradient called %s?\n\nIf you would like to try a different gradient, press cancel and select \"Random gradient\" again.</string>
+    <string name="prefs_uigradients_dialog_description">Apply gradient called %s?\n\nIf you would like to try a different gradient, press \"cancel\" and select \"Random gradient\" again.</string>
     <string name="prefs_uigradients_dialog_title">Random gradient</string>
     <string name="prefs_uigradients_summary">Random gradient</string>
     <string name="prefs_uigradients_title">Pick a random set of colors from uigradients.com</string>