diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java b/src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java
index 68911d193..ec422d9ff 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java
@@ -283,24 +283,17 @@ public final class FIBFieldHandler
         {
             result.append( '\t' );
             result.append( leftPad( Integer.toString( x ), 8, ' ' ) );
-            result.append( leftPad(
-                    Integer.toString( 154 + x * LittleEndian.INT_SIZE * 2 ), 6,
-                    ' ' ) );
+            result.append( leftPad( Integer.toString( 154 + x * LittleEndian.INT_SIZE * 2 ), 6, ' ' ) );
             result.append( "   0x" );
-            result.append( leftPad(
-                    Integer.toHexString( 154 + x * LittleEndian.INT_SIZE * 2 ),
-                    4, '0' ) );
-            result.append( leftPad( Integer.toString( getFieldOffset( x ) ), 8,
-                    ' ' ) );
-            result.append( leftPad( Integer.toString( getFieldSize( x ) ), 8,
-                    ' ' ) );
+            result.append( leftPad( Integer.toHexString( 154 + x * LittleEndian.INT_SIZE * 2 ), 4, '0' ) );
+            result.append( leftPad( Integer.toString( getFieldOffset( x ) ), 8, ' ' ) );
+            result.append( leftPad( Integer.toString( getFieldSize( x ) ), 8, ' ' ) );
 
-            UnhandledDataStructure structure = _unknownMap.get( Integer
-                    .valueOf( x ) );
+            UnhandledDataStructure structure = _unknownMap.get( Integer.valueOf( x ) );
             if ( structure != null )
             {
                 result.append( " => Unknown structure of size " );
-                result.append( structure._buf.length );
+                result.append( structure.getBuf().length );
             }
             result.append( '\n' );
         }
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/UnhandledDataStructure.java b/src/scratchpad/src/org/apache/poi/hwpf/model/UnhandledDataStructure.java
index 306697e47..89d5c492f 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/UnhandledDataStructure.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/model/UnhandledDataStructure.java
@@ -17,6 +17,8 @@
 
 package org.apache.poi.hwpf.model;
 
+import java.util.Arrays;
+
 import org.apache.poi.util.Internal;
 
 /**
@@ -27,7 +29,7 @@ import org.apache.poi.util.Internal;
 @Internal
 public final class UnhandledDataStructure
 {
-  byte[] _buf;
+  private final byte[] _buf;
 
   public UnhandledDataStructure(byte[] buf, int offset, int length)
   {
@@ -46,24 +48,11 @@ public final class UnhandledDataStructure
     }
     
     // Save that requested portion of the data 
-    _buf = copyOfRange(buf, offset, offsetEnd);
+    _buf = Arrays.copyOfRange(buf, offset, offsetEnd);
 
   }
 
-    /**
-     * YK: Arrays.copyOfRange is not in JDK 1.5
-     */
-    static byte[] copyOfRange(byte[] original, int from, int to) {
-        int newLength = to - from;
-        if (newLength < 0)
-            throw new IllegalArgumentException(from + " > " + to);
-        byte[] copy = new byte[newLength];
-        System.arraycopy(original, from, copy, 0,
-                Math.min(original.length - from, newLength));
-        return copy;
-    }
-
-  byte[] getBuf()
+  /*package*/ byte[] getBuf()
   {
     return _buf;
   }