diff --git a/connectionclass-sample/src/main/java/com/facebook/network/connectionclass/sample/MainActivity.java b/connectionclass-sample/src/main/java/com/facebook/network/connectionclass/sample/MainActivity.java
index a9ed6ce..57b3206 100644
--- a/connectionclass-sample/src/main/java/com/facebook/network/connectionclass/sample/MainActivity.java
+++ b/connectionclass-sample/src/main/java/com/facebook/network/connectionclass/sample/MainActivity.java
@@ -28,6 +28,7 @@
 public class MainActivity extends Activity {
 
   private static final String TAG = "ConnectionClass-Sample";
+  private static final int MAX_SAMPLE_RETRIES = 10;
 
   private ConnectionClassManager mConnectionClassManager;
   private DeviceBandwidthSampler mDeviceBandwidthSampler;
@@ -128,8 +129,7 @@ protected Void doInBackground(String... url) {
     @Override
     protected void onPostExecute(Void v) {
       mDeviceBandwidthSampler.stopSampling();
-      // Retry for up to 10 times until we find a ConnectionClass.
-      if (mConnectionClass == ConnectionQuality.UNKNOWN && mTries < 10) {
+      if (mConnectionClass == ConnectionQuality.UNKNOWN && mTries < MAX_SAMPLE_RETRIES) {
         mTries++;
         new DownloadImage().execute(mURL);
       }
diff --git a/connectionclass/src/main/java/com/facebook/network/connectionclass/ConnectionClassManager.java b/connectionclass/src/main/java/com/facebook/network/connectionclass/ConnectionClassManager.java
index 424c39a..917d743 100644
--- a/connectionclass/src/main/java/com/facebook/network/connectionclass/ConnectionClassManager.java
+++ b/connectionclass/src/main/java/com/facebook/network/connectionclass/ConnectionClassManager.java
@@ -240,9 +240,8 @@ public void remove(ConnectionClassStateChangeListener listener) {
   }
 
   private void notifyListeners() {
-    int size = mListenerList.size();
-    for (int i = 0; i < size; i++) {
-      mListenerList.get(i).onBandwidthStateChange(mCurrentBandwidthConnectionQuality.get());
+    for (ConnectionClassStateChangeListener stateChangeListener : mListenerList) {
+      stateChangeListener.onBandwidthStateChange(mCurrentBandwidthConnectionQuality.get());
     }
   }
 }
\ No newline at end of file