diff --git a/src/java/org/apache/poi/hpsf/Variant.java b/src/java/org/apache/poi/hpsf/Variant.java
index f49ce4a2e..bb3b39a15 100644
--- a/src/java/org/apache/poi/hpsf/Variant.java
+++ b/src/java/org/apache/poi/hpsf/Variant.java
@@ -74,180 +74,180 @@ public class Variant
 {
 
     /**
-     * <p>[V][P] Nothing.</p>
+     * <p>[V][P] Nothing, i.e. not a single byte of data.</p>
      */
-    public final static int VT_EMPTY = 0;
+    public static final int VT_EMPTY = 0;
 
     /**
      * <p>[V][P] SQL style Null.</p>
      */
-    public final static int VT_NULL = 1;
+    public static final int VT_NULL = 1;
 
     /**
      * <p>[V][T][P][S] 2 byte signed int.</p>
      */
-    public final static int VT_I2 = 2;
+    public static final int VT_I2 = 2;
 
     /**
      * <p>[V][T][P][S] 4 byte signed int.</p>
      */
-    public final static int VT_I4 = 3;
+    public static final int VT_I4 = 3;
 
     /**
      * <p>[V][T][P][S] 4 byte real.</p>
      */
-    public final static int VT_R4 = 4;
+    public static final int VT_R4 = 4;
 
     /**
      * <p>[V][T][P][S] 8 byte real.</p>
      */
-    public final static int VT_R8 = 5;
+    public static final int VT_R8 = 5;
 
     /**
      * <p>[V][T][P][S] currency. <span style="background-color:
      * #ffff00">How long is this? How is it to be
      * interpreted?</span></p>
      */
-    public final static int VT_CY = 6;
+    public static final int VT_CY = 6;
 
     /**
      * <p>[V][T][P][S] date. <span style="background-color:
      * #ffff00">How long is this? How is it to be
      * interpreted?</span></p>
      */
-    public final static int VT_DATE = 7;
+    public static final int VT_DATE = 7;
 
     /**
      * <p>[V][T][P][S] OLE Automation string. <span
      * style="background-color: #ffff00">How long is this? How is it
      * to be interpreted?</span></p>
      */
-    public final static int VT_BSTR = 8;
+    public static final int VT_BSTR = 8;
 
     /**
      * <p>[V][T][P][S] IDispatch *. <span style="background-color:
      * #ffff00">How long is this? How is it to be
      * interpreted?</span></p>
      */
-    public final static int VT_DISPATCH = 9;
+    public static final int VT_DISPATCH = 9;
 
     /**
      * <p>[V][T][S] SCODE. <span style="background-color: #ffff00">How
      * long is this? How is it to be interpreted?</span></p>
      */
-    public final static int VT_ERROR = 10;
+    public static final int VT_ERROR = 10;
 
     /**
      * <p>[V][T][P][S] True=-1, False=0.</p>
      */
-    public final static int VT_BOOL = 11;
+    public static final int VT_BOOL = 11;
 
     /**
      * <p>[V][T][P][S] VARIANT *. <span style="background-color:
      * #ffff00">How long is this? How is it to be
      * interpreted?</span></p>
      */
-    public final static int VT_VARIANT = 12;
+    public static final int VT_VARIANT = 12;
 
     /**
      * <p>[V][T][S] IUnknown *. <span style="background-color:
      * #ffff00">How long is this? How is it to be
      * interpreted?</span></p>
      */
-    public final static int VT_UNKNOWN = 13;
+    public static final int VT_UNKNOWN = 13;
 
     /**
      * <p>[V][T][S] 16 byte fixed point.</p>
      */
-    public final static int VT_DECIMAL = 14;
+    public static final int VT_DECIMAL = 14;
 
     /**
      * <p>[T] signed char.</p>
      */
-    public final static int VT_I1 = 16;
+    public static final int VT_I1 = 16;
 
     /**
      * <p>[V][T][P][S] unsigned char.</p>
      */
-    public final static int VT_UI1 = 17;
+    public static final int VT_UI1 = 17;
 
     /**
      * <p>[T][P] unsigned short.</p>
      */
-    public final static int VT_UI2 = 18;
+    public static final int VT_UI2 = 18;
 
     /**
      * <p>[T][P] unsigned int.</p>
      */
-    public final static int VT_UI4 = 19;
+    public static final int VT_UI4 = 19;
 
     /**
      * <p>[T][P] signed 64-bit int.</p>
      */
-    public final static int VT_I8 = 20;
+    public static final int VT_I8 = 20;
 
     /**
      * <p>[T][P] unsigned 64-bit int.</p>
      */
-    public final static int VT_UI8 = 21;
+    public static final int VT_UI8 = 21;
 
     /**
      * <p>[T] signed machine int.</p>
      */
-    public final static int VT_INT = 22;
+    public static final int VT_INT = 22;
 
     /**
      * <p>[T] unsigned machine int.</p>
      */
-    public final static int VT_UINT = 23;
+    public static final int VT_UINT = 23;
 
     /**
      * <p>[T] C style void.</p>
      */
-    public final static int VT_VOID = 24;
+    public static final int VT_VOID = 24;
 
     /**
      * <p>[T] Standard return type. <span style="background-color:
      * #ffff00">How long is this? How is it to be
      * interpreted?</span></p>
      */
-    public final static int VT_HRESULT = 25;
+    public static final int VT_HRESULT = 25;
 
     /**
      * <p>[T] pointer type. <span style="background-color:
      * #ffff00">How long is this? How is it to be
      * interpreted?</span></p>
      */
-    public final static int VT_PTR = 26;
+    public static final int VT_PTR = 26;
 
     /**
      * <p>[T] (use VT_ARRAY in VARIANT).</p>
      */
-    public final static int VT_SAFEARRAY = 27;
+    public static final int VT_SAFEARRAY = 27;
 
     /**
      * <p>[T] C style array. <span style="background-color:
      * #ffff00">How long is this? How is it to be
      * interpreted?</span></p>
      */
-    public final static int VT_CARRAY = 28;
+    public static final int VT_CARRAY = 28;
 
     /**
      * <p>[T] user defined type. <span style="background-color:
      * #ffff00">How long is this? How is it to be
      * interpreted?</span></p>
      */
-    public final static int VT_USERDEFINED = 29;
+    public static final int VT_USERDEFINED = 29;
 
     /**
      * <p>[T][P] null terminated string.</p>
      */
-    public final static int VT_LPSTR = 30;
+    public static final int VT_LPSTR = 30;
 
     /**
      * <p>[T][P] wide (Unicode) null terminated string.</p>
      */
-    public final static int VT_LPWSTR = 31;
+    public static final int VT_LPWSTR = 31;
 
     /**
      * <p>[P] FILETIME. The FILETIME structure holds a date and time
@@ -256,50 +256,50 @@ public class Variant
      * have passed since January 1, 1601. This 64-bit value is split
      * into the two dwords stored in the structure.</p>
      */
-    public final static int VT_FILETIME = 64;
+    public static final int VT_FILETIME = 64;
 
     /**
      * <p>[P] Length prefixed bytes.</p>
      */
-    public final static int VT_BLOB = 65;
+    public static final int VT_BLOB = 65;
 
     /**
      * <p>[P] Name of the stream follows.</p>
      */
-    public final static int VT_STREAM = 66;
+    public static final int VT_STREAM = 66;
 
     /**
      * <p>[P] Name of the storage follows.</p>
      */
-    public final static int VT_STORAGE = 67;
+    public static final int VT_STORAGE = 67;
 
     /**
      * <p>[P] Stream contains an object. <span
      * style="background-color: #ffff00"> How long is this? How is it
      * to be interpreted?</span></p>
      */
-    public final static int VT_STREAMED_OBJECT = 68;
+    public static final int VT_STREAMED_OBJECT = 68;
 
     /**
      * <p>[P] Storage contains an object. <span
      * style="background-color: #ffff00"> How long is this? How is it
      * to be interpreted?</span></p>
      */
-    public final static int VT_STORED_OBJECT = 69;
+    public static final int VT_STORED_OBJECT = 69;
 
     /**
      * <p>[P] Blob contains an object. <span style="background-color:
      * #ffff00">How long is this? How is it to be
      * interpreted?</span></p>
      */
-    public final static int VT_BLOB_OBJECT = 70;
+    public static final int VT_BLOB_OBJECT = 70;
 
     /**
      * <p>[P] Clipboard format. <span style="background-color:
      * #ffff00">How long is this? How is it to be
      * interpreted?</span></p>
      */
-    public final static int VT_CF = 71;
+    public static final int VT_CF = 71;
 
     /**
      * <p>[P] A Class ID.</p>
@@ -331,34 +331,46 @@ public class Variant
      * target="_blank">
      * msdn.microsoft.com/library/en-us/com/stgrstrc_0uwk.asp</a>.</p>
      */
-    public final static int VT_CLSID = 72;
+    public static final int VT_CLSID = 72;
 
     /**
      * <p>[P] simple counted array. <span style="background-color:
      * #ffff00">How long is this? How is it to be
      * interpreted?</span></p>
      */
-    public final static int VT_VECTOR = 0x1000;
+    public static final int VT_VECTOR = 0x1000;
 
     /**
      * <p>[V] SAFEARRAY*. <span style="background-color: #ffff00">How
      * long is this? How is it to be interpreted?</span></p>
      */
-    public final static int VT_ARRAY = 0x2000;
+    public static final int VT_ARRAY = 0x2000;
 
     /**
      * <p>[V] void* for local use. <span style="background-color:
      * #ffff00">How long is this? How is it to be
      * interpreted?</span></p>
      */
-    public final static int VT_BYREF = 0x4000;
+    public static final int VT_BYREF = 0x4000;
 
-    public final static int VT_RESERVED = 0x8000;
+    /**
+     * <p>FIXME: Document this!</p>
+     */
+    public static final int VT_RESERVED = 0x8000;
 
-    public final static int VT_ILLEGAL = 0xFFFF;
+    /**
+     * <p>FIXME: Document this!</p>
+     */
+    public static final int VT_ILLEGAL = 0xFFFF;
 
-    public final static int VT_ILLEGALMASKED = 0xFFF;
+    /**
+     * <p>FIXME: Document this!</p>
+     */
+    public static final int VT_ILLEGALMASKED = 0xFFF;
 
-    public final static int VT_TYPEMASK = 0xFFF;
+    /**
+     * <p>FIXME: Document this!</p>
+     */
+    public static final int VT_TYPEMASK = 0xFFF;
 
-}
+}
\ No newline at end of file