diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/MusicLibraryPagerAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/MusicLibraryPagerAdapter.java
index 9929a0c6..1f7ca2f1 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/MusicLibraryPagerAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/MusicLibraryPagerAdapter.java
@@ -165,9 +165,9 @@ public class MusicLibraryPagerAdapter extends FragmentPagerAdapter {
 
         public static MusicFragments of(Class<?> cl) {
             MusicFragments[] fragments = All.FRAGMENTS;
-            for (int i = 0; i < fragments.length; i++) {
-                if (cl.equals(fragments[i].mFragmentClass))
-                    return fragments[i];
+            for (MusicFragments fragment : fragments) {
+                if (cl.equals(fragment.mFragmentClass))
+                    return fragment;
             }
 
             throw new IllegalArgumentException("Unknown music fragment " + cl);
diff --git a/app/src/main/java/com/kabouzeid/gramophone/misc/CustomFragmentStatePagerAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/misc/CustomFragmentStatePagerAdapter.java
index 378a67f7..8136c2ce 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/misc/CustomFragmentStatePagerAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/misc/CustomFragmentStatePagerAdapter.java
@@ -203,8 +203,8 @@ public abstract class CustomFragmentStatePagerAdapter extends android.support.v4
             mSavedState.clear();
             mFragments.clear();
             if (fss != null) {
-                for (int i = 0; i < fss.length; i++) {
-                    mSavedState.add((Fragment.SavedState) fss[i]);
+                for (Parcelable fs : fss) {
+                    mSavedState.add((Fragment.SavedState) fs);
                 }
             }
             Iterable<String> keys = bundle.keySet();