diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFPictureData.java b/src/java/org/apache/poi/hssf/usermodel/HSSFPictureData.java
index 158d98c36..d8467b8c3 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFPictureData.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFPictureData.java
@@ -50,7 +50,7 @@ public class HSSFPictureData implements PictureData
      *
      * @param blip the underlying blip record containing the bitmap data.
      */
-    HSSFPictureData( EscherBlipRecord blip )
+    public HSSFPictureData( EscherBlipRecord blip )
     {
         this.blip = blip;
     }
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java b/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
index 54c9d36e0..812ffd0ac 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
@@ -1581,29 +1581,21 @@ public final class HSSFWorkbook extends POIDocument implements org.apache.poi.ss
      * @param escherRecords the escher records.
      * @param pictures the list to populate with the pictures.
      */
-    private void searchForPictures(List escherRecords, List<HSSFPictureData> pictures)
+    private void searchForPictures(List<EscherRecord> escherRecords, List<HSSFPictureData> pictures)
     {
-        Iterator recordIter = escherRecords.iterator();
-        while (recordIter.hasNext())
-        {
-            Object obj = recordIter.next();
-            if (obj instanceof EscherRecord)
-            {
-                EscherRecord escherRecord = (EscherRecord) obj;
+        for(EscherRecord escherRecord : escherRecords) {
+           if (escherRecord instanceof EscherBSERecord)
+           {
+              EscherBlipRecord blip = ((EscherBSERecord) escherRecord).getBlipRecord();
+              if (blip != null)
+              {
+                  // TODO: Some kind of structure.
+                  pictures.add(new HSSFPictureData(blip));
+              }
+           }
 
-                if (escherRecord instanceof EscherBSERecord)
-                {
-                    EscherBlipRecord blip = ((EscherBSERecord) escherRecord).getBlipRecord();
-                    if (blip != null)
-                    {
-                        // TODO: Some kind of structure.
-                        pictures.add(new HSSFPictureData(blip));
-                    }
-                }
-
-                // Recursive call.
-                searchForPictures(escherRecord.getChildRecords(), pictures);
-            }
+           // Recursive call.
+           searchForPictures(escherRecord.getChildRecords(), pictures);
         }
     }