diff --git a/Android/app/src/main/java/app/intra/net/socks/TLSProbe.java b/Android/app/src/main/java/app/intra/net/socks/TLSProbe.java
index 02173b28..0f565fa4 100644
--- a/Android/app/src/main/java/app/intra/net/socks/TLSProbe.java
+++ b/Android/app/src/main/java/app/intra/net/socks/TLSProbe.java
@@ -27,9 +27,9 @@
 // Static utility to check whether the user's connection supports standard TLS sockets.
 class TLSProbe {
   enum Result {SUCCESS, TLS_FAILED, OTHER_FAILED}
-  private static Result probe(String server) {
+  private static Result probe(String target) {
     try {
-      URL url = new URL("https://" + server);
+      URL url = new URL("https://" + target);
       url.openConnection().connect();
     } catch (SSLHandshakeException e) {
       if (e.getMessage().toLowerCase().contains("cert")) {
@@ -43,14 +43,14 @@ private static Result probe(String server) {
     return Result.SUCCESS;
   }
 
-  static Result run(Context context, String[] servers) {
+  static Result run(Context context, String[] targets) {
     Result worstResult = Result.SUCCESS;
-    for (String server : servers) {
-      Result r = probe(server);
+    for (String target : targets) {
+      Result r = probe(target);
       if (context != null) {
         Bundle b = new Bundle();
         b.putString(Names.RESULT.name(), r.name());
-        b.putString(Names.SERVER.name(), server);
+        b.putString(Names.SERVER.name(), target);
         FirebaseAnalytics.getInstance(context).logEvent(Names.TLS_PROBE.name(), b);
       }
       if (r == Result.TLS_FAILED ||
diff --git a/Android/app/src/main/java/app/intra/sys/AutoStarter.java b/Android/app/src/main/java/app/intra/sys/AutoStarter.java
index 81bdc042..d6c0fd9d 100644
--- a/Android/app/src/main/java/app/intra/sys/AutoStarter.java
+++ b/Android/app/src/main/java/app/intra/sys/AutoStarter.java
@@ -21,7 +21,6 @@
 import android.net.VpnService;
 import android.util.Log;
 import app.intra.ui.MainActivity;
-import com.google.firebase.remoteconfig.FirebaseRemoteConfig;
 
 /**
  * Broadcast receiver that runs on boot, and also when the app is restarted due to an update.
diff --git a/Android/app/src/main/java/app/intra/sys/RemoteConfig.java b/Android/app/src/main/java/app/intra/sys/RemoteConfig.java
index 92c385db..edc738d7 100644
--- a/Android/app/src/main/java/app/intra/sys/RemoteConfig.java
+++ b/Android/app/src/main/java/app/intra/sys/RemoteConfig.java
@@ -20,7 +20,9 @@
 import com.google.firebase.remoteconfig.FirebaseRemoteConfig;
 
 /**
- * Utility class for initializing Firebase Remote Config.
+ * Utility class for initializing Firebase Remote Config.  Remote Configuration allows us to conduct
+ * A/B tests of experimental functionality, and to enable or disable features without having to
+ * release a new version of the app.
  */
 public class RemoteConfig {
   public static Task<Boolean> update() {