You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2024/07/26 22:33:24 UTC

(commons-beanutils) branch 1.X updated: Remove useless comments

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch 1.X
in repository https://gitbox.apache.org/repos/asf/commons-beanutils.git


The following commit(s) were added to refs/heads/1.X by this push:
     new 4b59c1d8 Remove useless comments
4b59c1d8 is described below

commit 4b59c1d85893df16b01946f7c1a559c83950b982
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jul 26 18:33:19 2024 -0400

    Remove useless comments
---
 .../apache/commons/beanutils/BaseDynaBeanMapDecorator.java  |  5 -----
 .../java/org/apache/commons/beanutils/BasicDynaBean.java    |  4 ----
 .../java/org/apache/commons/beanutils/BasicDynaClass.java   |  5 -----
 .../commons/beanutils/BeanAccessLanguageException.java      |  1 -
 src/main/java/org/apache/commons/beanutils/BeanUtils.java   |  2 --
 .../java/org/apache/commons/beanutils/BeanUtilsBean.java    |  4 ----
 .../java/org/apache/commons/beanutils/ConstructorUtils.java |  3 ---
 .../org/apache/commons/beanutils/ConversionException.java   |  2 --
 .../java/org/apache/commons/beanutils/ConvertUtils.java     |  2 --
 .../java/org/apache/commons/beanutils/ConvertUtilsBean.java |  4 ----
 .../java/org/apache/commons/beanutils/DynaProperty.java     |  5 -----
 .../java/org/apache/commons/beanutils/JDBCDynaClass.java    |  2 --
 .../java/org/apache/commons/beanutils/LazyDynaBean.java     |  4 ----
 .../java/org/apache/commons/beanutils/LazyDynaList.java     |  4 ----
 src/main/java/org/apache/commons/beanutils/LazyDynaMap.java |  7 -------
 .../apache/commons/beanutils/MappedPropertyDescriptor.java  |  4 ----
 src/main/java/org/apache/commons/beanutils/MethodUtils.java |  3 ---
 .../org/apache/commons/beanutils/NestedNullException.java   |  1 -
 .../java/org/apache/commons/beanutils/PropertyUtils.java    |  3 ---
 .../org/apache/commons/beanutils/PropertyUtilsBean.java     |  4 ----
 .../org/apache/commons/beanutils/ResultSetDynaClass.java    |  5 -----
 .../org/apache/commons/beanutils/ResultSetIterator.java     |  5 -----
 .../java/org/apache/commons/beanutils/RowSetDynaClass.java  |  3 ---
 .../java/org/apache/commons/beanutils/WrapDynaBean.java     |  4 ----
 .../java/org/apache/commons/beanutils/WrapDynaClass.java    |  7 -------
 .../beanutils/converters/AbstractArrayConverter.java        |  5 -----
 .../commons/beanutils/converters/AbstractConverter.java     |  3 ---
 .../apache/commons/beanutils/converters/ArrayConverter.java |  1 -
 .../commons/beanutils/converters/BooleanArrayConverter.java |  4 ----
 .../commons/beanutils/converters/BooleanConverter.java      |  4 ----
 .../commons/beanutils/converters/ByteArrayConverter.java    |  3 ---
 .../beanutils/converters/CharacterArrayConverter.java       |  3 ---
 .../commons/beanutils/converters/DateTimeConverter.java     |  5 -----
 .../commons/beanutils/converters/DoubleArrayConverter.java  |  3 ---
 .../commons/beanutils/converters/FloatArrayConverter.java   |  3 ---
 .../commons/beanutils/converters/IntegerArrayConverter.java |  3 ---
 .../commons/beanutils/converters/LongArrayConverter.java    |  3 ---
 .../commons/beanutils/converters/NumberConverter.java       |  3 ---
 .../commons/beanutils/converters/ShortArrayConverter.java   |  3 ---
 .../commons/beanutils/converters/StringArrayConverter.java  |  3 ---
 .../commons/beanutils/locale/BaseLocaleConverter.java       |  3 ---
 .../apache/commons/beanutils/locale/LocaleBeanUtils.java    |  2 --
 .../commons/beanutils/locale/LocaleBeanUtilsBean.java       |  4 ----
 .../apache/commons/beanutils/locale/LocaleConvertUtils.java |  2 --
 .../commons/beanutils/locale/LocaleConvertUtilsBean.java    |  4 ----
 .../locale/converters/BigDecimalLocaleConverter.java        |  1 -
 .../locale/converters/BigIntegerLocaleConverter.java        |  1 -
 .../beanutils/locale/converters/ByteLocaleConverter.java    |  1 -
 .../beanutils/locale/converters/DateLocaleConverter.java    |  4 ----
 .../beanutils/locale/converters/DecimalLocaleConverter.java |  3 ---
 .../beanutils/locale/converters/DoubleLocaleConverter.java  |  1 -
 .../beanutils/locale/converters/FloatLocaleConverter.java   |  1 -
 .../beanutils/locale/converters/IntegerLocaleConverter.java |  1 -
 .../beanutils/locale/converters/LongLocaleConverter.java    |  1 -
 .../beanutils/locale/converters/ShortLocaleConverter.java   |  1 -
 .../beanutils/locale/converters/SqlDateLocaleConverter.java |  2 --
 .../beanutils/locale/converters/SqlTimeLocaleConverter.java |  2 --
 .../locale/converters/SqlTimestampLocaleConverter.java      |  2 --
 .../beanutils/locale/converters/StringLocaleConverter.java  |  3 ---
 .../org/apache/commons/beanutils/BasicDynaBeanTestCase.java |  5 -----
 .../apache/commons/beanutils/BeanComparatorTestCase.java    |  4 ----
 .../org/apache/commons/beanutils/BeanUtils2TestCase.java    |  2 --
 .../org/apache/commons/beanutils/BeanUtilsBenchCase.java    |  5 -----
 .../org/apache/commons/beanutils/BeanUtilsTestCase.java     |  4 ----
 .../org/apache/commons/beanutils/BeanificationTestCase.java |  6 ------
 src/test/java/org/apache/commons/beanutils/BenchBean.java   |  1 -
 .../apache/commons/beanutils/ConstructorUtilsTestCase.java  |  3 ---
 .../org/apache/commons/beanutils/ConvertUtilsTestCase.java  |  5 -----
 .../commons/beanutils/DynaBeanMapDecoratorTestCase.java     |  3 ---
 .../org/apache/commons/beanutils/DynaBeanUtilsTestCase.java |  5 -----
 .../apache/commons/beanutils/DynaPropertyUtilsTestCase.java |  5 -----
 .../org/apache/commons/beanutils/DynaResultSetTestCase.java |  4 ----
 .../org/apache/commons/beanutils/DynaRowSetTestCase.java    |  4 ----
 .../apache/commons/beanutils/IndexedPropertyTestCase.java   |  3 ---
 .../java/org/apache/commons/beanutils/IndexedTestBean.java  |  1 -
 .../org/apache/commons/beanutils/LazyDynaBeanTestCase.java  |  3 ---
 .../org/apache/commons/beanutils/LazyDynaClassTestCase.java |  3 ---
 .../org/apache/commons/beanutils/LazyDynaListTestCase.java  |  6 ------
 .../org/apache/commons/beanutils/LazyDynaMapTestCase.java   |  3 ---
 .../apache/commons/beanutils/MappedPropertyTestBean.java    |  1 -
 .../apache/commons/beanutils/MappedPropertyTestCase.java    |  3 ---
 .../org/apache/commons/beanutils/MethodUtilsTestCase.java   |  3 ---
 .../java/org/apache/commons/beanutils/NestedTestBean.java   |  3 ---
 .../apache/commons/beanutils/PropertyUtilsBenchCase.java    |  5 -----
 .../org/apache/commons/beanutils/PropertyUtilsTestCase.java |  9 ---------
 src/test/java/org/apache/commons/beanutils/TestBean.java    |  4 ----
 .../java/org/apache/commons/beanutils/TestResultSet.java    |  3 ---
 .../org/apache/commons/beanutils/TestResultSetMetaData.java |  3 ---
 .../org/apache/commons/beanutils/WrapDynaBeanTestCase.java  |  4 ----
 .../commons/beanutils/converters/DateConverterTestBase.java |  1 -
 .../commons/beanutils/locale/LocaleBeanUtilsTestCase.java   |  2 --
 .../beanutils/locale/LocaleBeanificationTestCase.java       |  6 ------
 .../beanutils/locale/LocaleConvertUtilsTestCase.java        |  5 -----
 .../locale/converters/BaseLocaleConverterTestCase.java      |  3 ---
 .../converters/BigDecimalLocaleConverterTestCase.java       | 12 ------------
 .../converters/BigIntegerLocaleConverterTestCase.java       | 12 ------------
 .../locale/converters/ByteLocaleConverterTestCase.java      | 12 ------------
 .../locale/converters/DateLocaleConverterTestCase.java      | 11 -----------
 .../locale/converters/DoubleLocaleConverterTestCase.java    | 12 ------------
 .../locale/converters/FloatLocaleConverterTestCase.java     | 12 ------------
 .../locale/converters/IntegerLocaleConverterTestCase.java   | 13 -------------
 .../locale/converters/LongLocaleConverterTestCase.java      | 12 ------------
 .../locale/converters/ShortLocaleConverterTestCase.java     | 12 ------------
 .../java/org/apache/commons/beanutils/priv/PackageBean.java |  2 --
 .../java/org/apache/commons/beanutils/priv/PrivateBean.java |  2 --
 .../apache/commons/beanutils/priv/PrivateBeanSubclass.java  |  2 --
 .../org/apache/commons/beanutils/priv/PrivateDirect.java    |  1 -
 .../org/apache/commons/beanutils/priv/PrivateIndirect.java  |  1 -
 .../org/apache/commons/beanutils/priv/PublicSubBean.java    |  2 --
 109 files changed, 429 deletions(-)

diff --git a/src/main/java/org/apache/commons/beanutils/BaseDynaBeanMapDecorator.java b/src/main/java/org/apache/commons/beanutils/BaseDynaBeanMapDecorator.java
index 0985c6c1..d22d20da 100644
--- a/src/main/java/org/apache/commons/beanutils/BaseDynaBeanMapDecorator.java
+++ b/src/main/java/org/apache/commons/beanutils/BaseDynaBeanMapDecorator.java
@@ -54,7 +54,6 @@ public abstract class BaseDynaBeanMapDecorator<K> implements Map<K, Object> {
     private final boolean readOnly;
     private transient Set<K> keySet;
 
-    // ------------------- Constructors ----------------------------------
 
     /**
      * Constructs a read only Map for the specified
@@ -84,7 +83,6 @@ public abstract class BaseDynaBeanMapDecorator<K> implements Map<K, Object> {
     }
 
 
-    // ------------------- public Methods --------------------------------
 
 
     /**
@@ -97,7 +95,6 @@ public abstract class BaseDynaBeanMapDecorator<K> implements Map<K, Object> {
         return readOnly;
     }
 
-    // ------------------- java.util.Map Methods -------------------------
 
     /**
      * clear() operation is not supported.
@@ -311,7 +308,6 @@ public abstract class BaseDynaBeanMapDecorator<K> implements Map<K, Object> {
         return Collections.unmodifiableList(values);
     }
 
-    // ------------------- protected Methods -----------------------------
 
     /**
      * Provide access to the underlying {@link DynaBean}
@@ -331,7 +327,6 @@ public abstract class BaseDynaBeanMapDecorator<K> implements Map<K, Object> {
      */
     protected abstract K convertKey(String propertyName);
 
-    // ------------------- private Methods -------------------------------
 
     /**
      * Convenience method to retrieve the {@link DynaProperty}s
diff --git a/src/main/java/org/apache/commons/beanutils/BasicDynaBean.java b/src/main/java/org/apache/commons/beanutils/BasicDynaBean.java
index 91a9617c..421f4b0f 100644
--- a/src/main/java/org/apache/commons/beanutils/BasicDynaBean.java
+++ b/src/main/java/org/apache/commons/beanutils/BasicDynaBean.java
@@ -42,7 +42,6 @@ import java.util.Map;
 public class BasicDynaBean implements DynaBean, Serializable {
 
 
-    // ---------------------------------------------------------- Constructors
 
 
     private static final long serialVersionUID = 1L;
@@ -60,7 +59,6 @@ public class BasicDynaBean implements DynaBean, Serializable {
     }
 
 
-    // ---------------------------------------------------- Instance Variables
 
 
     /**
@@ -98,7 +96,6 @@ public class BasicDynaBean implements DynaBean, Serializable {
 
     }
 
-    // ------------------------------------------------------ DynaBean Methods
 
 
     /**
@@ -406,7 +403,6 @@ public class BasicDynaBean implements DynaBean, Serializable {
     }
 
 
-    // ------------------------------------------------------ Protected Methods
 
 
     /**
diff --git a/src/main/java/org/apache/commons/beanutils/BasicDynaClass.java b/src/main/java/org/apache/commons/beanutils/BasicDynaClass.java
index 5d92a27b..5684bc1a 100644
--- a/src/main/java/org/apache/commons/beanutils/BasicDynaClass.java
+++ b/src/main/java/org/apache/commons/beanutils/BasicDynaClass.java
@@ -38,7 +38,6 @@ import java.util.HashMap;
 public class BasicDynaClass implements DynaClass, Serializable {
 
 
-    // ----------------------------------------------------------- Constructors
 
 
     private static final long serialVersionUID = 1L;
@@ -91,7 +90,6 @@ public class BasicDynaClass implements DynaClass, Serializable {
     }
 
 
-    // ----------------------------------------------------- Instance Variables
 
 
     /**
@@ -142,7 +140,6 @@ public class BasicDynaClass implements DynaClass, Serializable {
     protected HashMap<String, DynaProperty> propertiesMap = new HashMap<>();
 
 
-    // ------------------------------------------------------ DynaClass Methods
 
 
     /**
@@ -232,7 +229,6 @@ public class BasicDynaClass implements DynaClass, Serializable {
     }
 
 
-    // --------------------------------------------------------- Public Methods
 
 
     /**
@@ -249,7 +245,6 @@ public class BasicDynaClass implements DynaClass, Serializable {
     }
 
 
-    // ------------------------------------------------------ Protected Methods
 
 
     /**
diff --git a/src/main/java/org/apache/commons/beanutils/BeanAccessLanguageException.java b/src/main/java/org/apache/commons/beanutils/BeanAccessLanguageException.java
index dfb7acad..3c0cdd0e 100644
--- a/src/main/java/org/apache/commons/beanutils/BeanAccessLanguageException.java
+++ b/src/main/java/org/apache/commons/beanutils/BeanAccessLanguageException.java
@@ -27,7 +27,6 @@ package org.apache.commons.beanutils;
 
 public class BeanAccessLanguageException extends IllegalArgumentException {
 
-    // --------------------------------------------------------- Constuctors
 
     private static final long serialVersionUID = 1L;
 
diff --git a/src/main/java/org/apache/commons/beanutils/BeanUtils.java b/src/main/java/org/apache/commons/beanutils/BeanUtils.java
index 4c9033a3..8d7f781d 100644
--- a/src/main/java/org/apache/commons/beanutils/BeanUtils.java
+++ b/src/main/java/org/apache/commons/beanutils/BeanUtils.java
@@ -36,7 +36,6 @@ import java.util.Map;
 public class BeanUtils {
 
 
-    // ------------------------------------------------------ Private Variables
 
 
     /**
@@ -78,7 +77,6 @@ public class BeanUtils {
         debug = newDebug;
     }
 
-    // --------------------------------------------------------- Class Methods
 
 
     /**
diff --git a/src/main/java/org/apache/commons/beanutils/BeanUtilsBean.java b/src/main/java/org/apache/commons/beanutils/BeanUtilsBean.java
index 6be2bd09..47924654 100644
--- a/src/main/java/org/apache/commons/beanutils/BeanUtilsBean.java
+++ b/src/main/java/org/apache/commons/beanutils/BeanUtilsBean.java
@@ -50,7 +50,6 @@ import org.apache.commons.logging.LogFactory;
 public class BeanUtilsBean {
 
 
-    // ------------------------------------------------------ Private Class Variables
 
     /**
      * Contains <code>BeanUtilsBean</code> instances indexed by context classloader.
@@ -86,7 +85,6 @@ public class BeanUtilsBean {
         BEANS_BY_CLASSLOADER.set(newInstance);
     }
 
-    // --------------------------------------------------------- Attributes
 
     /**
      * Logging for this instance
@@ -102,7 +100,6 @@ public class BeanUtilsBean {
     /** A reference to Throwable's initCause method, or null if it's not there in this JVM */
     private static final Method INIT_CAUSE_METHOD = getInitCauseMethod();
 
-    // --------------------------------------------------------- Constuctors
 
     /**
      * <p>Constructs an instance using new property
@@ -141,7 +138,6 @@ public class BeanUtilsBean {
         this.propertyUtilsBean = propertyUtilsBean;
     }
 
-    // --------------------------------------------------------- Public Methods
 
     /**
      * <p>Clone a bean based on the available property getters and setters,
diff --git a/src/main/java/org/apache/commons/beanutils/ConstructorUtils.java b/src/main/java/org/apache/commons/beanutils/ConstructorUtils.java
index ae2dc97a..fc2ef682 100644
--- a/src/main/java/org/apache/commons/beanutils/ConstructorUtils.java
+++ b/src/main/java/org/apache/commons/beanutils/ConstructorUtils.java
@@ -39,13 +39,11 @@ import java.lang.reflect.Modifier;
  */
 public class ConstructorUtils {
 
-    // --------------------------------------------------------- Private Members
     /** An empty class array */
     private static final Class<?>[] EMPTY_CLASS_PARAMETERS = {};
     /** An empty object array */
     private static final Object[] EMPTY_OBJECT_ARRAY = {};
 
-    // --------------------------------------------------------- Public Methods
 
     /**
      * <p>Convenience method returning new instance of <code>klazz</code> using a single argument constructor.
@@ -346,7 +344,6 @@ public class ConstructorUtils {
         return args;
     }
 
-    // -------------------------------------------------------- Private Methods
     /**
      * <p>Find an accessible constructor with compatible parameters.
      * Compatible parameters mean that every method parameter is assignable from
diff --git a/src/main/java/org/apache/commons/beanutils/ConversionException.java b/src/main/java/org/apache/commons/beanutils/ConversionException.java
index b7671f2a..e9c0c97f 100644
--- a/src/main/java/org/apache/commons/beanutils/ConversionException.java
+++ b/src/main/java/org/apache/commons/beanutils/ConversionException.java
@@ -29,7 +29,6 @@ package org.apache.commons.beanutils;
 public class ConversionException extends RuntimeException {
 
 
-    // ----------------------------------------------------------- Constructors
 
 
     private static final long serialVersionUID = 1L;
@@ -73,7 +72,6 @@ public class ConversionException extends RuntimeException {
     }
 
 
-    // ------------------------------------------------------------- Properties
 
 
     /**
diff --git a/src/main/java/org/apache/commons/beanutils/ConvertUtils.java b/src/main/java/org/apache/commons/beanutils/ConvertUtils.java
index 24847ebf..c37c0c87 100644
--- a/src/main/java/org/apache/commons/beanutils/ConvertUtils.java
+++ b/src/main/java/org/apache/commons/beanutils/ConvertUtils.java
@@ -31,7 +31,6 @@ package org.apache.commons.beanutils;
 public class ConvertUtils {
 
 
-    // ------------------------------------------------------ Static Properties
 
     /**
      * Gets the default value for Boolean conversions.
@@ -216,7 +215,6 @@ public class ConvertUtils {
         ConvertUtilsBean.getInstance().setDefaultShort(newDefaultShort);
     }
 
-    // --------------------------------------------------------- Public Classes
 
 
     /**
diff --git a/src/main/java/org/apache/commons/beanutils/ConvertUtilsBean.java b/src/main/java/org/apache/commons/beanutils/ConvertUtilsBean.java
index dfcd9f1b..220d6515 100644
--- a/src/main/java/org/apache/commons/beanutils/ConvertUtilsBean.java
+++ b/src/main/java/org/apache/commons/beanutils/ConvertUtilsBean.java
@@ -128,7 +128,6 @@ public class ConvertUtilsBean {
     private static final Integer ZERO = Integer.valueOf(0);
     private static final Character SPACE = Character.valueOf(' ');
 
-    // ------------------------------------------------------- Class Methods
     /**
      * Get singleton instance
      * @return The singleton instance
@@ -137,7 +136,6 @@ public class ConvertUtilsBean {
         return BeanUtilsBean.getInstance().getConvertUtils();
     }
 
-    // ------------------------------------------------------- Variables
 
 
     /**
@@ -152,7 +150,6 @@ public class ConvertUtilsBean {
      */
     private final Log log = LogFactory.getLog(ConvertUtils.class);
 
-    // ------------------------------------------------------- Constructors
 
     /** Construct a bean with standard converters registered */
     public ConvertUtilsBean() {
@@ -161,7 +158,6 @@ public class ConvertUtilsBean {
         converters.setFast(true);
     }
 
-    // --------------------------------------------------------- Public Methods
 
     /**
      * The default value for Boolean conversions.
diff --git a/src/main/java/org/apache/commons/beanutils/DynaProperty.java b/src/main/java/org/apache/commons/beanutils/DynaProperty.java
index 930f9173..5f69839a 100644
--- a/src/main/java/org/apache/commons/beanutils/DynaProperty.java
+++ b/src/main/java/org/apache/commons/beanutils/DynaProperty.java
@@ -42,7 +42,6 @@ import java.util.Map;
 
 public class DynaProperty implements Serializable {
 
-    // ----------------------------------------------------------- Constants
 
     private static final long serialVersionUID = 1L;
     /*
@@ -63,7 +62,6 @@ public class DynaProperty implements Serializable {
     private static final int SHORT_TYPE = 8;
 
 
-    // ----------------------------------------------------------- Constructors
 
 
     /**
@@ -110,7 +108,6 @@ public class DynaProperty implements Serializable {
 
     }
 
-    // ------------------------------------------------------------- Properties
 
     /** Property name */
     protected String name = null;
@@ -158,7 +155,6 @@ public class DynaProperty implements Serializable {
         return contentType;
     }
 
-    // --------------------------------------------------------- Public Methods
 
 
     /**
@@ -255,7 +251,6 @@ public class DynaProperty implements Serializable {
 
     }
 
-    // --------------------------------------------------------- Serialization helper methods
 
     /**
      * Writes this object safely.
diff --git a/src/main/java/org/apache/commons/beanutils/JDBCDynaClass.java b/src/main/java/org/apache/commons/beanutils/JDBCDynaClass.java
index c9a7f296..7c6f2a7d 100644
--- a/src/main/java/org/apache/commons/beanutils/JDBCDynaClass.java
+++ b/src/main/java/org/apache/commons/beanutils/JDBCDynaClass.java
@@ -35,7 +35,6 @@ import java.util.Map;
 
 abstract class JDBCDynaClass implements DynaClass, Serializable {
 
-    // ----------------------------------------------------- Instance Variables
 
     private static final long serialVersionUID = 1L;
 
@@ -70,7 +69,6 @@ abstract class JDBCDynaClass implements DynaClass, Serializable {
      */
     private Map<String, String> columnNameXref;
 
-    // ------------------------------------------------------ DynaClass Methods
 
     /**
      * <p>Return the name of this DynaClass (analogous to the
diff --git a/src/main/java/org/apache/commons/beanutils/LazyDynaBean.java b/src/main/java/org/apache/commons/beanutils/LazyDynaBean.java
index f03a32f7..8f9ebe4a 100644
--- a/src/main/java/org/apache/commons/beanutils/LazyDynaBean.java
+++ b/src/main/java/org/apache/commons/beanutils/LazyDynaBean.java
@@ -155,7 +155,6 @@ public class LazyDynaBean implements DynaBean, Serializable {
     protected MutableDynaClass dynaClass;
 
 
-    // ------------------- Constructors ----------------------------------
 
     /**
      * Construct a new <code>LazyDynaBean</code> with a <code>LazyDynaClass</code> instance.
@@ -193,7 +192,6 @@ public class LazyDynaBean implements DynaBean, Serializable {
     }
 
 
-    // ------------------- Public Methods ----------------------------------
 
     /**
      * Return a Map representation of this DynaBean.
@@ -246,7 +244,6 @@ public class LazyDynaBean implements DynaBean, Serializable {
 
     }
 
-    // ------------------- DynaBean Methods ----------------------------------
 
     /**
      * Does the specified mapped property contain a value for the specified
@@ -598,7 +595,6 @@ public class LazyDynaBean implements DynaBean, Serializable {
 
     }
 
-    // ------------------- protected Methods ----------------------------------
 
     /**
      * Grow the size of an indexed property
diff --git a/src/main/java/org/apache/commons/beanutils/LazyDynaList.java b/src/main/java/org/apache/commons/beanutils/LazyDynaList.java
index 676dccb7..3efa31b7 100644
--- a/src/main/java/org/apache/commons/beanutils/LazyDynaList.java
+++ b/src/main/java/org/apache/commons/beanutils/LazyDynaList.java
@@ -187,7 +187,6 @@ public class LazyDynaList extends ArrayList<Object> {
     private Class<?> elementDynaBeanType;
 
 
-    // ------------------- Constructors ------------------------------
 
     /**
      * Default Constructor.
@@ -251,7 +250,6 @@ public class LazyDynaList extends ArrayList<Object> {
     }
 
 
-    // ------------------- java.util.List Methods --------------------
 
     /**
      * <p>Insert an element at the specified index position.</p>
@@ -477,7 +475,6 @@ public class LazyDynaList extends ArrayList<Object> {
     }
 
 
-    // ------------------- Public Methods ----------------------------
 
     /**
      * <p>Converts the List to an DynaBean Array.</p>
@@ -591,7 +588,6 @@ public class LazyDynaList extends ArrayList<Object> {
     }
 
 
-    // ------------------- Private Methods ---------------------------
 
     /**
      * <p>Automatically <em>grown</em> the List
diff --git a/src/main/java/org/apache/commons/beanutils/LazyDynaMap.java b/src/main/java/org/apache/commons/beanutils/LazyDynaMap.java
index 746b8612..fc08ed0d 100644
--- a/src/main/java/org/apache/commons/beanutils/LazyDynaMap.java
+++ b/src/main/java/org/apache/commons/beanutils/LazyDynaMap.java
@@ -68,7 +68,6 @@ public class LazyDynaMap extends LazyDynaBean implements MutableDynaClass {
     protected boolean returnNull = false;
 
 
-    // ------------------- Constructors ----------------------------------
 
     /**
      * Default Constructor.
@@ -140,7 +139,6 @@ public class LazyDynaMap extends LazyDynaBean implements MutableDynaClass {
         this(dynaClass.getName(), dynaClass.getDynaProperties());
     }
 
-    // ------------------- Public Methods ----------------------------------
 
     /**
      * Set the Map backing this <code>DynaBean</code>
@@ -161,7 +159,6 @@ public class LazyDynaMap extends LazyDynaBean implements MutableDynaClass {
         return values;
     }
 
-    // ------------------- DynaBean Methods ----------------------------------
 
     /**
      * Set the value of a simple property with the specified name.
@@ -181,7 +178,6 @@ public class LazyDynaMap extends LazyDynaBean implements MutableDynaClass {
 
     }
 
-    // ------------------- DynaClass Methods ----------------------------------
 
     /**
      * Return the name of this DynaClass (analogous to the
@@ -297,7 +293,6 @@ public class LazyDynaMap extends LazyDynaBean implements MutableDynaClass {
     }
 
 
-    // ------------------- MutableDynaClass Methods ----------------------------------
 
     /**
      * <p>Is this DynaClass currently restricted.</p>
@@ -438,7 +433,6 @@ public class LazyDynaMap extends LazyDynaBean implements MutableDynaClass {
     }
 
 
-    // ------------------- Additional Public Methods ----------------------------------
 
     /**
      * Should this DynaClass return a <code>null</code> from
@@ -467,7 +461,6 @@ public class LazyDynaMap extends LazyDynaBean implements MutableDynaClass {
     }
 
 
-    // ------------------- Protected Methods ----------------------------------
 
    /**
      * <p>Indicate whether a property actually exists.</p>
diff --git a/src/main/java/org/apache/commons/beanutils/MappedPropertyDescriptor.java b/src/main/java/org/apache/commons/beanutils/MappedPropertyDescriptor.java
index 2b93b9a9..c00e0353 100644
--- a/src/main/java/org/apache/commons/beanutils/MappedPropertyDescriptor.java
+++ b/src/main/java/org/apache/commons/beanutils/MappedPropertyDescriptor.java
@@ -42,7 +42,6 @@ import java.lang.reflect.Modifier;
  *
  */
 public class MappedPropertyDescriptor extends PropertyDescriptor {
-    // ----------------------------------------------------- Instance Variables
 
     /**
      * The underlying data type of the property we are describing.
@@ -64,7 +63,6 @@ public class MappedPropertyDescriptor extends PropertyDescriptor {
      */
     private static final Class<?>[] STRING_CLASS_PARAMETER = new Class[]{String.class};
 
-    // ----------------------------------------------------------- Constructors
 
     /**
      * Constructs a MappedPropertyDescriptor for a property that follows
@@ -211,7 +209,6 @@ public class MappedPropertyDescriptor extends PropertyDescriptor {
         findMappedPropertyType();
     }
 
-    // -------------------------------------------------------- Public Methods
 
     /**
      * Gets the Class object for the property values.
@@ -273,7 +270,6 @@ public class MappedPropertyDescriptor extends PropertyDescriptor {
         findMappedPropertyType();
     }
 
-    // ------------------------------------------------------- Private Methods
 
     /**
      * Introspect our bean class to identify the corresponding getter
diff --git a/src/main/java/org/apache/commons/beanutils/MethodUtils.java b/src/main/java/org/apache/commons/beanutils/MethodUtils.java
index a6b9fa6f..2205bc58 100644
--- a/src/main/java/org/apache/commons/beanutils/MethodUtils.java
+++ b/src/main/java/org/apache/commons/beanutils/MethodUtils.java
@@ -50,7 +50,6 @@ import org.apache.commons.logging.LogFactory;
 
 public class MethodUtils {
 
-    // --------------------------------------------------------- Private Methods
 
     /**
      * Only log warning about accessibility work around once.
@@ -103,7 +102,6 @@ public class MethodUtils {
     private static final Map<MethodDescriptor, Reference<Method>> cache = Collections
             .synchronizedMap(new WeakHashMap<MethodDescriptor, Reference<Method>>());
 
-    // --------------------------------------------------------- Public Methods
 
     /**
      * Set whether methods should be cached for greater performance or not,
@@ -821,7 +819,6 @@ public class MethodUtils {
     }
 
 
-    // -------------------------------------------------------- Private Methods
 
     /**
      * <p>Return an accessible method (that is, one that can be invoked via
diff --git a/src/main/java/org/apache/commons/beanutils/NestedNullException.java b/src/main/java/org/apache/commons/beanutils/NestedNullException.java
index 53114068..0b002932 100644
--- a/src/main/java/org/apache/commons/beanutils/NestedNullException.java
+++ b/src/main/java/org/apache/commons/beanutils/NestedNullException.java
@@ -26,7 +26,6 @@ package org.apache.commons.beanutils;
 
 public class NestedNullException extends BeanAccessLanguageException {
 
-    // --------------------------------------------------------- Constuctors
 
     private static final long serialVersionUID = 1L;
 
diff --git a/src/main/java/org/apache/commons/beanutils/PropertyUtils.java b/src/main/java/org/apache/commons/beanutils/PropertyUtils.java
index 968489f1..0ba52a79 100644
--- a/src/main/java/org/apache/commons/beanutils/PropertyUtils.java
+++ b/src/main/java/org/apache/commons/beanutils/PropertyUtils.java
@@ -40,7 +40,6 @@ import org.apache.commons.collections.FastHashMap;
 public class PropertyUtils {
 
 
-    // ----------------------------------------------------- Manifest Constants
 
 
     /**
@@ -100,7 +99,6 @@ public class PropertyUtils {
     public static final char NESTED_DELIM = '.';
 
 
-    // ------------------------------------------------------- Static Variables
 
 
     /**
@@ -136,7 +134,6 @@ public class PropertyUtils {
         debug = newDebug;
     }
 
-    // --------------------------------------------------------- Public Methods
 
 
     /**
diff --git a/src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.java b/src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.java
index 7b99c1a0..f1485327 100644
--- a/src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.java
+++ b/src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.java
@@ -96,7 +96,6 @@ public class PropertyUtilsBean {
 
     private Resolver resolver = new DefaultResolver();
 
-    // --------------------------------------------------------- Class Methods
 
     /**
      * Return the PropertyUtils bean instance.
@@ -106,7 +105,6 @@ public class PropertyUtilsBean {
         return BeanUtilsBean.getInstance().getPropertyUtils();
     }
 
-    // --------------------------------------------------------- Variables
 
     /**
      * The cache of PropertyDescriptor arrays for beans we have already
@@ -124,7 +122,6 @@ public class PropertyUtilsBean {
     /** The list with BeanIntrospector objects. */
     private final List<BeanIntrospector> introspectors;
 
-    // ---------------------------------------------------------- Constructors
 
     /** Base constructor */
     public PropertyUtilsBean() {
@@ -137,7 +134,6 @@ public class PropertyUtilsBean {
     }
 
 
-    // --------------------------------------------------------- Public Methods
 
 
     /**
diff --git a/src/main/java/org/apache/commons/beanutils/ResultSetDynaClass.java b/src/main/java/org/apache/commons/beanutils/ResultSetDynaClass.java
index f6a24528..e29a8b6d 100644
--- a/src/main/java/org/apache/commons/beanutils/ResultSetDynaClass.java
+++ b/src/main/java/org/apache/commons/beanutils/ResultSetDynaClass.java
@@ -82,7 +82,6 @@ import java.util.Iterator;
 public class ResultSetDynaClass extends JDBCDynaClass implements DynaClass {
 
 
-    // ----------------------------------------------------------- Constructors
 
 
     private static final long serialVersionUID = 1L;
@@ -173,7 +172,6 @@ public class ResultSetDynaClass extends JDBCDynaClass implements DynaClass {
     }
 
 
-    // ----------------------------------------------------- Instance Variables
 
 
     /**
@@ -182,7 +180,6 @@ public class ResultSetDynaClass extends JDBCDynaClass implements DynaClass {
     protected ResultSet resultSet = null;
 
 
-    // --------------------------------------------------------- Public Methods
 
 
     /**
@@ -212,7 +209,6 @@ public class ResultSetDynaClass extends JDBCDynaClass implements DynaClass {
         return getObject(getResultSet(), name);
     }
 
-    // -------------------------------------------------------- Package Methods
 
 
     /**
@@ -225,7 +221,6 @@ public class ResultSetDynaClass extends JDBCDynaClass implements DynaClass {
     }
 
 
-    // ------------------------------------------------------ Protected Methods
 
     /**
      * <p>Loads the class of the given name which by default uses the class loader used
diff --git a/src/main/java/org/apache/commons/beanutils/ResultSetIterator.java b/src/main/java/org/apache/commons/beanutils/ResultSetIterator.java
index 5d015985..cc982511 100644
--- a/src/main/java/org/apache/commons/beanutils/ResultSetIterator.java
+++ b/src/main/java/org/apache/commons/beanutils/ResultSetIterator.java
@@ -35,7 +35,6 @@ import java.util.NoSuchElementException;
 public class ResultSetIterator implements DynaBean, Iterator<DynaBean> {
 
 
-    // ------------------------------------------------------------ Constructor
 
 
     /**
@@ -52,7 +51,6 @@ public class ResultSetIterator implements DynaBean, Iterator<DynaBean> {
     }
 
 
-    // ----------------------------------------------------- Instance Variables
 
 
 
@@ -76,7 +74,6 @@ public class ResultSetIterator implements DynaBean, Iterator<DynaBean> {
     protected boolean eof = false;
 
 
-    // ------------------------------------------------------- DynaBean Methods
 
 
     /**
@@ -283,7 +280,6 @@ public class ResultSetIterator implements DynaBean, Iterator<DynaBean> {
     }
 
 
-    // ------------------------------------------------------- Iterator Methods
 
 
     /**
@@ -339,7 +335,6 @@ public class ResultSetIterator implements DynaBean, Iterator<DynaBean> {
     }
 
 
-    // ------------------------------------------------------ Protected Methods
 
 
     /**
diff --git a/src/main/java/org/apache/commons/beanutils/RowSetDynaClass.java b/src/main/java/org/apache/commons/beanutils/RowSetDynaClass.java
index f03f4b08..c89c6970 100644
--- a/src/main/java/org/apache/commons/beanutils/RowSetDynaClass.java
+++ b/src/main/java/org/apache/commons/beanutils/RowSetDynaClass.java
@@ -67,7 +67,6 @@ import java.util.List;
 public class RowSetDynaClass extends JDBCDynaClass implements DynaClass, Serializable {
 
 
-    // ----------------------------------------------------- Instance variables
 
     private static final long serialVersionUID = 1L;
 
@@ -85,7 +84,6 @@ public class RowSetDynaClass extends JDBCDynaClass implements DynaClass, Seriali
      */
     protected List<DynaBean> rows = new ArrayList<>();
 
-    // ----------------------------------------------------------- Constructors
 
 
     /**
@@ -269,7 +267,6 @@ public class RowSetDynaClass extends JDBCDynaClass implements DynaClass, Seriali
     }
 
 
-    // ------------------------------------------------------ Protected Methods
 
 
     /**
diff --git a/src/main/java/org/apache/commons/beanutils/WrapDynaBean.java b/src/main/java/org/apache/commons/beanutils/WrapDynaBean.java
index 93ff2c1f..ac62b05e 100644
--- a/src/main/java/org/apache/commons/beanutils/WrapDynaBean.java
+++ b/src/main/java/org/apache/commons/beanutils/WrapDynaBean.java
@@ -46,7 +46,6 @@ import java.lang.reflect.InvocationTargetException;
 public class WrapDynaBean implements DynaBean, Serializable {
 
 
-    // ---------------------------------------------------------- Constructors
 
 
     private static final long serialVersionUID = 1L;
@@ -82,7 +81,6 @@ public class WrapDynaBean implements DynaBean, Serializable {
 
     }
 
-    // ---------------------------------------------------- Instance Variables
 
 
     /**
@@ -98,7 +96,6 @@ public class WrapDynaBean implements DynaBean, Serializable {
     protected Object instance = null;
 
 
-    // ------------------------------------------------------ DynaBean Methods
 
 
     /**
@@ -379,7 +376,6 @@ public class WrapDynaBean implements DynaBean, Serializable {
     }
 
 
-    // ------------------------------------------------------ Protected Methods
 
 
     /**
diff --git a/src/main/java/org/apache/commons/beanutils/WrapDynaClass.java b/src/main/java/org/apache/commons/beanutils/WrapDynaClass.java
index e562b2a7..bbc210aa 100644
--- a/src/main/java/org/apache/commons/beanutils/WrapDynaClass.java
+++ b/src/main/java/org/apache/commons/beanutils/WrapDynaClass.java
@@ -50,7 +50,6 @@ import java.util.WeakHashMap;
 public class WrapDynaClass implements DynaClass {
 
 
-    // ----------------------------------------------------------- Constructors
 
 
     /**
@@ -71,7 +70,6 @@ public class WrapDynaClass implements DynaClass {
     }
 
 
-    // ----------------------------------------------------- Instance Variables
 
     /**
      * Name of the JavaBean class represented by this WrapDynaClass.
@@ -124,7 +122,6 @@ public class WrapDynaClass implements DynaClass {
     protected HashMap<String, DynaProperty> propertiesMap = new HashMap<>();
 
 
-    // ------------------------------------------------------- Static Variables
 
 
     private static final ContextClassLoaderLocal<Map<CacheKey, WrapDynaClass>> CLASSLOADER_CACHE =
@@ -264,7 +261,6 @@ public class WrapDynaClass implements DynaClass {
     };
 
 
-    // ------------------------------------------------------ DynaClass Methods
 
     /**
      * Return the class of the underlying wrapped bean.
@@ -367,7 +363,6 @@ public class WrapDynaClass implements DynaClass {
     }
 
 
-    // --------------------------------------------------------- Public Methods
 
 
     /**
@@ -384,7 +379,6 @@ public class WrapDynaClass implements DynaClass {
     }
 
 
-    // --------------------------------------------------------- Static Methods
 
 
     /**
@@ -437,7 +431,6 @@ public class WrapDynaClass implements DynaClass {
     }
 
 
-    // ------------------------------------------------------ Protected Methods
 
     /**
      * Returns the {@code PropertyUtilsBean} instance associated with this class. This
diff --git a/src/main/java/org/apache/commons/beanutils/converters/AbstractArrayConverter.java b/src/main/java/org/apache/commons/beanutils/converters/AbstractArrayConverter.java
index 18042208..fc274c39 100644
--- a/src/main/java/org/apache/commons/beanutils/converters/AbstractArrayConverter.java
+++ b/src/main/java/org/apache/commons/beanutils/converters/AbstractArrayConverter.java
@@ -51,7 +51,6 @@ import org.apache.commons.beanutils.Converter;
 public abstract class AbstractArrayConverter implements Converter {
 
 
-    // ----------------------------------------------------------- Constructors
 
 
     /**
@@ -83,7 +82,6 @@ public abstract class AbstractArrayConverter implements Converter {
 
     }
 
-    // ------------------------------------------------------- Static Variables
 
     /**
      * This is a special reference that can be passed as the "default object"
@@ -94,7 +92,6 @@ public abstract class AbstractArrayConverter implements Converter {
      */
     public static final Object NO_DEFAULT = new Object();
 
-    // ----------------------------------------------------- Instance Variables
 
 
     /**
@@ -115,7 +112,6 @@ public abstract class AbstractArrayConverter implements Converter {
     protected boolean useDefault = true;
 
 
-    // --------------------------------------------------------- Public Methods
 
 
     /**
@@ -134,7 +130,6 @@ public abstract class AbstractArrayConverter implements Converter {
     public abstract Object convert(Class type, Object value);
 
 
-    // ------------------------------------------------------ Protected Methods
 
 
     /**
diff --git a/src/main/java/org/apache/commons/beanutils/converters/AbstractConverter.java b/src/main/java/org/apache/commons/beanutils/converters/AbstractConverter.java
index f106337d..5416af77 100644
--- a/src/main/java/org/apache/commons/beanutils/converters/AbstractConverter.java
+++ b/src/main/java/org/apache/commons/beanutils/converters/AbstractConverter.java
@@ -80,7 +80,6 @@ public abstract class AbstractConverter implements Converter {
      */
     private Object defaultValue = null;
 
-    // ----------------------------------------------------------- Constructors
 
     /**
      * Construct a <em>Converter</em> that throws a
@@ -101,7 +100,6 @@ public abstract class AbstractConverter implements Converter {
         setDefaultValue(defaultValue);
     }
 
-    // --------------------------------------------------------- Public Methods
 
     /**
      * Indicates whether a default value will be returned or exception
@@ -388,7 +386,6 @@ public abstract class AbstractConverter implements Converter {
         return toString(getClass()) + "[UseDefault=" + useDefault + "]";
     }
 
-    // ----------------------------------------------------------- Package Methods
 
     /**
      * Accessor method for Log instance.
diff --git a/src/main/java/org/apache/commons/beanutils/converters/ArrayConverter.java b/src/main/java/org/apache/commons/beanutils/converters/ArrayConverter.java
index 3c268b93..ad3a546a 100644
--- a/src/main/java/org/apache/commons/beanutils/converters/ArrayConverter.java
+++ b/src/main/java/org/apache/commons/beanutils/converters/ArrayConverter.java
@@ -133,7 +133,6 @@ public class ArrayConverter extends AbstractConverter {
     private char[] allowedChars = {'.', '-'};
     private boolean onlyFirstToString = true;
 
-    // ----------------------------------------------------------- Constructors
 
     /**
      * Construct an <b>array</b> <code>Converter</code> with the specified
diff --git a/src/main/java/org/apache/commons/beanutils/converters/BooleanArrayConverter.java b/src/main/java/org/apache/commons/beanutils/converters/BooleanArrayConverter.java
index 9dc58757..06914789 100644
--- a/src/main/java/org/apache/commons/beanutils/converters/BooleanArrayConverter.java
+++ b/src/main/java/org/apache/commons/beanutils/converters/BooleanArrayConverter.java
@@ -42,7 +42,6 @@ import org.apache.commons.beanutils.ConversionException;
 public final class BooleanArrayConverter extends AbstractArrayConverter {
 
 
-    // ----------------------------------------------------------- Constructors
 
 
     /**
@@ -100,7 +99,6 @@ public final class BooleanArrayConverter extends AbstractArrayConverter {
 
     }
 
-    // ------------------------------------------------------- Static Variables
 
     /**
      * Type which this class converts its input to. This value can be
@@ -117,7 +115,6 @@ public final class BooleanArrayConverter extends AbstractArrayConverter {
     private static final BooleanConverter DEFAULT_CONVERTER
         = new BooleanConverter();
 
-    // ---------------------------------------------------- Instance Variables
 
     /**
      * This object is used to perform the conversion of individual strings
@@ -125,7 +122,6 @@ public final class BooleanArrayConverter extends AbstractArrayConverter {
      */
     protected final BooleanConverter booleanConverter;
 
-    // --------------------------------------------------------- Public Methods
 
 
     /**
diff --git a/src/main/java/org/apache/commons/beanutils/converters/BooleanConverter.java b/src/main/java/org/apache/commons/beanutils/converters/BooleanConverter.java
index 13620a37..5fb0fbf9 100644
--- a/src/main/java/org/apache/commons/beanutils/converters/BooleanConverter.java
+++ b/src/main/java/org/apache/commons/beanutils/converters/BooleanConverter.java
@@ -51,7 +51,6 @@ package org.apache.commons.beanutils.converters;
 public final class BooleanConverter extends AbstractConverter {
 
 
-    // ----------------------------------------------------------- Constructors
 
 
     /**
@@ -138,7 +137,6 @@ public final class BooleanConverter extends AbstractConverter {
     }
 
 
-    // ----------------------------------------------------- Static Variables
 
 
     /**
@@ -152,7 +150,6 @@ public final class BooleanConverter extends AbstractConverter {
     public static final Object NO_DEFAULT = new Object();
 
 
-    // ----------------------------------------------------- Instance Variables
 
     /**
      * The set of strings that are known to map to Boolean.TRUE.
@@ -164,7 +161,6 @@ public final class BooleanConverter extends AbstractConverter {
      */
     private String[] falseStrings = {"false", "no", "n", "off", "0"};
 
-    // --------------------------------------------------------- Protected Methods
 
     /**
      * Return the default type this <code>Converter</code> handles.
diff --git a/src/main/java/org/apache/commons/beanutils/converters/ByteArrayConverter.java b/src/main/java/org/apache/commons/beanutils/converters/ByteArrayConverter.java
index bae3ebba..d5c93a6e 100644
--- a/src/main/java/org/apache/commons/beanutils/converters/ByteArrayConverter.java
+++ b/src/main/java/org/apache/commons/beanutils/converters/ByteArrayConverter.java
@@ -37,7 +37,6 @@ import org.apache.commons.beanutils.ConversionException;
 public final class ByteArrayConverter extends AbstractArrayConverter {
 
 
-    // ----------------------------------------------------------- Constructors
 
 
     /**
@@ -66,7 +65,6 @@ public final class ByteArrayConverter extends AbstractArrayConverter {
     }
 
 
-    // ------------------------------------------------------- Static Variables
 
 
     /**
@@ -75,7 +73,6 @@ public final class ByteArrayConverter extends AbstractArrayConverter {
     private static final byte[] MODEL = {};
 
 
-    // --------------------------------------------------------- Public Methods
 
 
     /**
diff --git a/src/main/java/org/apache/commons/beanutils/converters/CharacterArrayConverter.java b/src/main/java/org/apache/commons/beanutils/converters/CharacterArrayConverter.java
index c0a6729d..603373b6 100644
--- a/src/main/java/org/apache/commons/beanutils/converters/CharacterArrayConverter.java
+++ b/src/main/java/org/apache/commons/beanutils/converters/CharacterArrayConverter.java
@@ -37,7 +37,6 @@ import org.apache.commons.beanutils.ConversionException;
 public final class CharacterArrayConverter extends AbstractArrayConverter {
 
 
-    // ----------------------------------------------------------- Constructors
 
 
     /**
@@ -66,7 +65,6 @@ public final class CharacterArrayConverter extends AbstractArrayConverter {
     }
 
 
-    // ------------------------------------------------------- Static Variables
 
 
     /**
@@ -75,7 +73,6 @@ public final class CharacterArrayConverter extends AbstractArrayConverter {
     private static final char[] MODEL = {};
 
 
-    // --------------------------------------------------------- Public Methods
 
 
     /**
diff --git a/src/main/java/org/apache/commons/beanutils/converters/DateTimeConverter.java b/src/main/java/org/apache/commons/beanutils/converters/DateTimeConverter.java
index be0667e3..ee794c90 100644
--- a/src/main/java/org/apache/commons/beanutils/converters/DateTimeConverter.java
+++ b/src/main/java/org/apache/commons/beanutils/converters/DateTimeConverter.java
@@ -85,7 +85,6 @@ public abstract class DateTimeConverter extends AbstractConverter {
     private boolean useLocaleFormat;
 
 
-    // ----------------------------------------------------------- Constructors
 
     /**
      * Construct a Date/Time <em>Converter</em> that throws a
@@ -107,7 +106,6 @@ public abstract class DateTimeConverter extends AbstractConverter {
     }
 
 
-    // --------------------------------------------------------- Public Methods
 
     /**
      * Indicate whether conversion should use a format/pattern or not.
@@ -203,7 +201,6 @@ public abstract class DateTimeConverter extends AbstractConverter {
         setUseLocaleFormat(true);
     }
 
-    // ------------------------------------------------------ Protected Methods
 
     /**
      * Convert an input Date/Calendar object into a String.
@@ -290,14 +287,12 @@ public abstract class DateTimeConverter extends AbstractConverter {
         // Handle java.sql.Timestamp
         if (value instanceof java.sql.Timestamp) {
 
-            // ---------------------- JDK 1.3 Fix ----------------------
             // N.B. Prior to JDK 1.4 the Timestamp's getTime() method
             //      didn't include the milliseconds. The following code
             //      ensures it works consistently accross JDK versions
             final java.sql.Timestamp timestamp = (java.sql.Timestamp)value;
             long timeInMillis = timestamp.getTime() / 1000 * 1000;
             timeInMillis += timestamp.getNanos() / 1000000;
-            // ---------------------- JDK 1.3 Fix ----------------------
             return toDate(targetType, timeInMillis);
         }
 
diff --git a/src/main/java/org/apache/commons/beanutils/converters/DoubleArrayConverter.java b/src/main/java/org/apache/commons/beanutils/converters/DoubleArrayConverter.java
index 70fb825b..2db82b27 100644
--- a/src/main/java/org/apache/commons/beanutils/converters/DoubleArrayConverter.java
+++ b/src/main/java/org/apache/commons/beanutils/converters/DoubleArrayConverter.java
@@ -37,7 +37,6 @@ import org.apache.commons.beanutils.ConversionException;
 public final class DoubleArrayConverter extends AbstractArrayConverter {
 
 
-    // ----------------------------------------------------------- Constructors
 
 
     /**
@@ -66,7 +65,6 @@ public final class DoubleArrayConverter extends AbstractArrayConverter {
     }
 
 
-    // ------------------------------------------------------- Static Variables
 
 
     /**
@@ -75,7 +73,6 @@ public final class DoubleArrayConverter extends AbstractArrayConverter {
     private static final double[] MODEL = {};
 
 
-    // --------------------------------------------------------- Public Methods
 
 
     /**
diff --git a/src/main/java/org/apache/commons/beanutils/converters/FloatArrayConverter.java b/src/main/java/org/apache/commons/beanutils/converters/FloatArrayConverter.java
index 52b9da1f..491c1ec4 100644
--- a/src/main/java/org/apache/commons/beanutils/converters/FloatArrayConverter.java
+++ b/src/main/java/org/apache/commons/beanutils/converters/FloatArrayConverter.java
@@ -37,7 +37,6 @@ import org.apache.commons.beanutils.ConversionException;
 public final class FloatArrayConverter extends AbstractArrayConverter {
 
 
-    // ----------------------------------------------------------- Constructors
 
 
     /**
@@ -66,7 +65,6 @@ public final class FloatArrayConverter extends AbstractArrayConverter {
     }
 
 
-    // ------------------------------------------------------- Static Variables
 
 
     /**
@@ -75,7 +73,6 @@ public final class FloatArrayConverter extends AbstractArrayConverter {
     private static final float[] MODEL = {};
 
 
-    // --------------------------------------------------------- Public Methods
 
 
     /**
diff --git a/src/main/java/org/apache/commons/beanutils/converters/IntegerArrayConverter.java b/src/main/java/org/apache/commons/beanutils/converters/IntegerArrayConverter.java
index 9e837410..c56200f0 100644
--- a/src/main/java/org/apache/commons/beanutils/converters/IntegerArrayConverter.java
+++ b/src/main/java/org/apache/commons/beanutils/converters/IntegerArrayConverter.java
@@ -37,7 +37,6 @@ import org.apache.commons.beanutils.ConversionException;
 public final class IntegerArrayConverter extends AbstractArrayConverter {
 
 
-    // ----------------------------------------------------------- Constructors
 
 
     /**
@@ -66,7 +65,6 @@ public final class IntegerArrayConverter extends AbstractArrayConverter {
     }
 
 
-    // ------------------------------------------------------- Static Variables
 
 
     /**
@@ -75,7 +73,6 @@ public final class IntegerArrayConverter extends AbstractArrayConverter {
     private static final int[] MODEL = {};
 
 
-    // --------------------------------------------------------- Public Methods
 
 
     /**
diff --git a/src/main/java/org/apache/commons/beanutils/converters/LongArrayConverter.java b/src/main/java/org/apache/commons/beanutils/converters/LongArrayConverter.java
index 76c68c7a..d00f9282 100644
--- a/src/main/java/org/apache/commons/beanutils/converters/LongArrayConverter.java
+++ b/src/main/java/org/apache/commons/beanutils/converters/LongArrayConverter.java
@@ -37,7 +37,6 @@ import org.apache.commons.beanutils.ConversionException;
 public final class LongArrayConverter extends AbstractArrayConverter {
 
 
-    // ----------------------------------------------------------- Constructors
 
 
     /**
@@ -66,7 +65,6 @@ public final class LongArrayConverter extends AbstractArrayConverter {
     }
 
 
-    // ------------------------------------------------------- Static Variables
 
 
     /**
@@ -75,7 +73,6 @@ public final class LongArrayConverter extends AbstractArrayConverter {
     private static final long[] MODEL = {};
 
 
-    // --------------------------------------------------------- Public Methods
 
 
     /**
diff --git a/src/main/java/org/apache/commons/beanutils/converters/NumberConverter.java b/src/main/java/org/apache/commons/beanutils/converters/NumberConverter.java
index 5355311c..82663925 100644
--- a/src/main/java/org/apache/commons/beanutils/converters/NumberConverter.java
+++ b/src/main/java/org/apache/commons/beanutils/converters/NumberConverter.java
@@ -91,7 +91,6 @@ public abstract class NumberConverter extends AbstractConverter {
     private boolean useLocaleFormat;
     private Locale locale;
 
-    // ----------------------------------------------------------- Constructors
 
     /**
      * Construct a <b>java.lang.Number</b> <em>Converter</em>
@@ -115,7 +114,6 @@ public abstract class NumberConverter extends AbstractConverter {
         setDefaultValue(defaultValue);
     }
 
-    // --------------------------------------------------------- Public Methods
 
     /**
      * Return whether decimals are allowed in the number.
@@ -185,7 +183,6 @@ public abstract class NumberConverter extends AbstractConverter {
         setUseLocaleFormat(true);
     }
 
-    // ------------------------------------------------------ Protected Methods
 
     /**
      * Convert an input Number object into a String.
diff --git a/src/main/java/org/apache/commons/beanutils/converters/ShortArrayConverter.java b/src/main/java/org/apache/commons/beanutils/converters/ShortArrayConverter.java
index 6189db69..48d84755 100644
--- a/src/main/java/org/apache/commons/beanutils/converters/ShortArrayConverter.java
+++ b/src/main/java/org/apache/commons/beanutils/converters/ShortArrayConverter.java
@@ -37,7 +37,6 @@ import org.apache.commons.beanutils.ConversionException;
 public final class ShortArrayConverter extends AbstractArrayConverter {
 
 
-    // ----------------------------------------------------------- Constructors
 
 
     /**
@@ -66,7 +65,6 @@ public final class ShortArrayConverter extends AbstractArrayConverter {
     }
 
 
-    // ------------------------------------------------------- Static Variables
 
 
     /**
@@ -75,7 +73,6 @@ public final class ShortArrayConverter extends AbstractArrayConverter {
     private static final short[] MODEL = {};
 
 
-    // --------------------------------------------------------- Public Methods
 
 
     /**
diff --git a/src/main/java/org/apache/commons/beanutils/converters/StringArrayConverter.java b/src/main/java/org/apache/commons/beanutils/converters/StringArrayConverter.java
index 15a04cb6..1e95ae30 100644
--- a/src/main/java/org/apache/commons/beanutils/converters/StringArrayConverter.java
+++ b/src/main/java/org/apache/commons/beanutils/converters/StringArrayConverter.java
@@ -40,7 +40,6 @@ import org.apache.commons.beanutils.ConversionException;
 public final class StringArrayConverter extends AbstractArrayConverter {
 
 
-    // ----------------------------------------------------------- Constructors
 
 
     /**
@@ -69,7 +68,6 @@ public final class StringArrayConverter extends AbstractArrayConverter {
     }
 
 
-    // ------------------------------------------------------- Static Variables
 
 
     /**
@@ -84,7 +82,6 @@ public final class StringArrayConverter extends AbstractArrayConverter {
 
 
 
-    // --------------------------------------------------------- Public Methods
 
 
     /**
diff --git a/src/main/java/org/apache/commons/beanutils/locale/BaseLocaleConverter.java b/src/main/java/org/apache/commons/beanutils/locale/BaseLocaleConverter.java
index 40991adb..5c4f8e59 100644
--- a/src/main/java/org/apache/commons/beanutils/locale/BaseLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils/locale/BaseLocaleConverter.java
@@ -37,7 +37,6 @@ import org.apache.commons.logging.LogFactory;
 
 public abstract class BaseLocaleConverter implements LocaleConverter {
 
-    // ----------------------------------------------------- Instance Variables
 
     /** All logging goes through this logger */
     private final Log log = LogFactory.getLog(BaseLocaleConverter.class);
@@ -57,7 +56,6 @@ public abstract class BaseLocaleConverter implements LocaleConverter {
     /** The flag indicating whether the given pattern string is localized or not. */
     protected boolean locPattern = false;
 
-    // ----------------------------------------------------------- Constructors
 
     /**
      * Create a {@link LocaleConverter} that will throw a {@link ConversionException}
@@ -139,7 +137,6 @@ public abstract class BaseLocaleConverter implements LocaleConverter {
         this.locPattern = locPattern;
     }
 
-    // --------------------------------------------------------- Methods
 
     /**
      * Convert the specified locale-sensitive input object into an output object of the
diff --git a/src/main/java/org/apache/commons/beanutils/locale/LocaleBeanUtils.java b/src/main/java/org/apache/commons/beanutils/locale/LocaleBeanUtils.java
index 8f699a81..332df53d 100644
--- a/src/main/java/org/apache/commons/beanutils/locale/LocaleBeanUtils.java
+++ b/src/main/java/org/apache/commons/beanutils/locale/LocaleBeanUtils.java
@@ -37,7 +37,6 @@ import org.apache.commons.beanutils.BeanUtils;
 public class LocaleBeanUtils extends BeanUtils {
 
 
-    // ----------------------------------------------------- Instance Variables
 
     /**
      * <p>Gets the locale used when no locale is passed.</p>
@@ -95,7 +94,6 @@ public class LocaleBeanUtils extends BeanUtils {
     }
 
 
-    // --------------------------------------------------------- Public Methods
 
     /**
      * <p>Return the value of the specified locale-sensitive indexed property
diff --git a/src/main/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsBean.java b/src/main/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsBean.java
index fe086b7c..d4e38b31 100644
--- a/src/main/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsBean.java
+++ b/src/main/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsBean.java
@@ -81,12 +81,10 @@ public class LocaleBeanUtilsBean extends BeanUtilsBean {
     /** All logging goes through this logger */
     private final Log log = LogFactory.getLog(LocaleBeanUtilsBean.class);
 
-    // ----------------------------------------------------- Instance Variables
 
     /** Convertor used by this class */
     private final LocaleConvertUtilsBean localeConvertUtils;
 
-    // --------------------------------------------------------- Constructors
 
     /** Construct instance with standard conversion bean */
     public LocaleBeanUtilsBean() {
@@ -119,7 +117,6 @@ public class LocaleBeanUtilsBean extends BeanUtilsBean {
         this.localeConvertUtils = localeConvertUtils;
     }
 
-    // --------------------------------------------------------- Public Methods
 
     /**
      * Gets the bean instance used for conversions
@@ -175,7 +172,6 @@ public class LocaleBeanUtilsBean extends BeanUtilsBean {
     }
 
 
-    // --------------------------------------------------------- Public Methods
 
     /**
      * Return the value of the specified locale-sensitive indexed property
diff --git a/src/main/java/org/apache/commons/beanutils/locale/LocaleConvertUtils.java b/src/main/java/org/apache/commons/beanutils/locale/LocaleConvertUtils.java
index 2e070430..7a21ed7e 100644
--- a/src/main/java/org/apache/commons/beanutils/locale/LocaleConvertUtils.java
+++ b/src/main/java/org/apache/commons/beanutils/locale/LocaleConvertUtils.java
@@ -33,7 +33,6 @@ import org.apache.commons.collections.FastHashMap;
  */
 public class LocaleConvertUtils {
 
-    // ----------------------------------------------------- Instance Variables
 
     /**
      * <p>Gets the <code>Locale</code> which will be used when
@@ -88,7 +87,6 @@ public class LocaleConvertUtils {
         LocaleConvertUtilsBean.getInstance().setApplyLocalized(newApplyLocalized);
     }
 
-    // --------------------------------------------------------- Methods
 
     /**
      * <p>Convert the specified locale-sensitive value into a String.</p>
diff --git a/src/main/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsBean.java b/src/main/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsBean.java
index 52536428..018da3b9 100644
--- a/src/main/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsBean.java
+++ b/src/main/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsBean.java
@@ -92,7 +92,6 @@ public class LocaleConvertUtilsBean {
         return LocaleBeanUtilsBean.getLocaleBeanUtilsInstance().getLocaleConvertUtils();
     }
 
-    // ----------------------------------------------------- Instance Variables
 
     /** The locale - default for convertion. */
     private Locale defaultLocale = Locale.getDefault();
@@ -109,7 +108,6 @@ public class LocaleConvertUtilsBean {
      */
     private final FastHashMap mapConverters = new DelegateFastHashMap(BeanUtils.createCache());
 
-    // --------------------------------------------------------- Constructors
 
     /**
      *  Makes the state by default (deregisters all converters for all locales)
@@ -121,7 +119,6 @@ public class LocaleConvertUtilsBean {
         mapConverters.setFast(true);
     }
 
-    // --------------------------------------------------------- Properties
 
     /**
      * getter for defaultLocale.
@@ -166,7 +163,6 @@ public class LocaleConvertUtilsBean {
         applyLocalized = newApplyLocalized;
     }
 
-    // --------------------------------------------------------- Methods
 
     /**
      * Convert the specified locale-sensitive value into a String.
diff --git a/src/main/java/org/apache/commons/beanutils/locale/converters/BigDecimalLocaleConverter.java b/src/main/java/org/apache/commons/beanutils/locale/converters/BigDecimalLocaleConverter.java
index 0b6b5c6b..87de4f9b 100644
--- a/src/main/java/org/apache/commons/beanutils/locale/converters/BigDecimalLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils/locale/converters/BigDecimalLocaleConverter.java
@@ -34,7 +34,6 @@ import org.apache.commons.beanutils.ConversionException;
 
 public class BigDecimalLocaleConverter extends DecimalLocaleConverter {
 
-    // ----------------------------------------------------------- Constructors
 
     /**
      * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
diff --git a/src/main/java/org/apache/commons/beanutils/locale/converters/BigIntegerLocaleConverter.java b/src/main/java/org/apache/commons/beanutils/locale/converters/BigIntegerLocaleConverter.java
index 3b643c41..f7400693 100644
--- a/src/main/java/org/apache/commons/beanutils/locale/converters/BigIntegerLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils/locale/converters/BigIntegerLocaleConverter.java
@@ -35,7 +35,6 @@ import org.apache.commons.beanutils.ConversionException;
 public class BigIntegerLocaleConverter extends DecimalLocaleConverter {
 
 
-    // ----------------------------------------------------------- Constructors
 
     /**
      * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
diff --git a/src/main/java/org/apache/commons/beanutils/locale/converters/ByteLocaleConverter.java b/src/main/java/org/apache/commons/beanutils/locale/converters/ByteLocaleConverter.java
index a48fa9e3..0215d95e 100644
--- a/src/main/java/org/apache/commons/beanutils/locale/converters/ByteLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils/locale/converters/ByteLocaleConverter.java
@@ -36,7 +36,6 @@ import java.text.ParseException;
 public class ByteLocaleConverter extends DecimalLocaleConverter {
 
 
-    // ----------------------------------------------------------- Constructors
 
     /**
      * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
diff --git a/src/main/java/org/apache/commons/beanutils/locale/converters/DateLocaleConverter.java b/src/main/java/org/apache/commons/beanutils/locale/converters/DateLocaleConverter.java
index 52bd4b00..003c07a6 100644
--- a/src/main/java/org/apache/commons/beanutils/locale/converters/DateLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils/locale/converters/DateLocaleConverter.java
@@ -42,7 +42,6 @@ import org.apache.commons.logging.LogFactory;
 
 public class DateLocaleConverter extends BaseLocaleConverter {
 
-    // ----------------------------------------------------- Instance Variables
 
     /** All logging goes through this logger */
     private final Log log = LogFactory.getLog(DateLocaleConverter.class);
@@ -56,7 +55,6 @@ public class DateLocaleConverter extends BaseLocaleConverter {
      */
     private static final String DEFAULT_PATTERN_CHARS = DateLocaleConverter.initDefaultChars();
 
-    // ----------------------------------------------------------- Constructors
 
     /**
      * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
@@ -221,7 +219,6 @@ public class DateLocaleConverter extends BaseLocaleConverter {
         super(defaultValue, locale, pattern, locPattern);
     }
 
-    // --------------------------------------------------------- Methods
 
     /**
      * Returns whether date formatting is lenient.
@@ -243,7 +240,6 @@ public class DateLocaleConverter extends BaseLocaleConverter {
         isLenient = lenient;
     }
 
-    // --------------------------------------------------------- Methods
 
     /**
      * Convert the specified locale-sensitive input object into an output object of the
diff --git a/src/main/java/org/apache/commons/beanutils/locale/converters/DecimalLocaleConverter.java b/src/main/java/org/apache/commons/beanutils/locale/converters/DecimalLocaleConverter.java
index fbe78bb0..f5812c95 100644
--- a/src/main/java/org/apache/commons/beanutils/locale/converters/DecimalLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils/locale/converters/DecimalLocaleConverter.java
@@ -40,12 +40,10 @@ import java.util.Locale;
 public class DecimalLocaleConverter extends BaseLocaleConverter {
 
 
-    // ----------------------------------------------------- Instance Variables
 
     /** All logging goes through this logger */
     private final Log log = LogFactory.getLog(DecimalLocaleConverter.class);
 
-    // ----------------------------------------------------------- Constructors
 
     /**
      * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
@@ -210,7 +208,6 @@ public class DecimalLocaleConverter extends BaseLocaleConverter {
 
     }
 
-    // --------------------------------------------------------- Methods
 
     /**
      * Convert the specified locale-sensitive input object into an output
diff --git a/src/main/java/org/apache/commons/beanutils/locale/converters/DoubleLocaleConverter.java b/src/main/java/org/apache/commons/beanutils/locale/converters/DoubleLocaleConverter.java
index 8a509dea..edc84b23 100644
--- a/src/main/java/org/apache/commons/beanutils/locale/converters/DoubleLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils/locale/converters/DoubleLocaleConverter.java
@@ -35,7 +35,6 @@ import java.util.Locale;
 public class DoubleLocaleConverter extends DecimalLocaleConverter {
 
 
-    // ----------------------------------------------------------- Constructors
 
     /**
      * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
diff --git a/src/main/java/org/apache/commons/beanutils/locale/converters/FloatLocaleConverter.java b/src/main/java/org/apache/commons/beanutils/locale/converters/FloatLocaleConverter.java
index 36f2cc84..253c9a57 100644
--- a/src/main/java/org/apache/commons/beanutils/locale/converters/FloatLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils/locale/converters/FloatLocaleConverter.java
@@ -36,7 +36,6 @@ import java.text.ParseException;
 public class FloatLocaleConverter extends DecimalLocaleConverter {
 
 
-    // ----------------------------------------------------------- Constructors
 
     /**
      * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
diff --git a/src/main/java/org/apache/commons/beanutils/locale/converters/IntegerLocaleConverter.java b/src/main/java/org/apache/commons/beanutils/locale/converters/IntegerLocaleConverter.java
index fe903777..4b0e396a 100644
--- a/src/main/java/org/apache/commons/beanutils/locale/converters/IntegerLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils/locale/converters/IntegerLocaleConverter.java
@@ -36,7 +36,6 @@ import java.text.ParseException;
 public class IntegerLocaleConverter extends DecimalLocaleConverter {
 
 
-    // ----------------------------------------------------------- Constructors
 
     /**
      * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
diff --git a/src/main/java/org/apache/commons/beanutils/locale/converters/LongLocaleConverter.java b/src/main/java/org/apache/commons/beanutils/locale/converters/LongLocaleConverter.java
index 4b04396a..8636e902 100644
--- a/src/main/java/org/apache/commons/beanutils/locale/converters/LongLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils/locale/converters/LongLocaleConverter.java
@@ -34,7 +34,6 @@ import java.text.ParseException;
 public class LongLocaleConverter extends DecimalLocaleConverter {
 
 
-    // ----------------------------------------------------------- Constructors
 
     /**
      * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
diff --git a/src/main/java/org/apache/commons/beanutils/locale/converters/ShortLocaleConverter.java b/src/main/java/org/apache/commons/beanutils/locale/converters/ShortLocaleConverter.java
index 20d12124..7b5d7021 100644
--- a/src/main/java/org/apache/commons/beanutils/locale/converters/ShortLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils/locale/converters/ShortLocaleConverter.java
@@ -34,7 +34,6 @@ import org.apache.commons.beanutils.ConversionException;
 
 public class ShortLocaleConverter extends DecimalLocaleConverter {
 
-    // ----------------------------------------------------------- Constructors
 
     /**
      * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
diff --git a/src/main/java/org/apache/commons/beanutils/locale/converters/SqlDateLocaleConverter.java b/src/main/java/org/apache/commons/beanutils/locale/converters/SqlDateLocaleConverter.java
index 0f746380..d5ca6c04 100644
--- a/src/main/java/org/apache/commons/beanutils/locale/converters/SqlDateLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils/locale/converters/SqlDateLocaleConverter.java
@@ -34,7 +34,6 @@ import java.util.Locale;
 public class SqlDateLocaleConverter extends DateLocaleConverter {
 
 
-    // ----------------------------------------------------------- Constructors
 
     /**
      * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
@@ -199,7 +198,6 @@ public class SqlDateLocaleConverter extends DateLocaleConverter {
     }
 
 
-    // --------------------------------------------------------- Methods
 
     /**
      * Convert the specified locale-sensitive input object into an output object of the
diff --git a/src/main/java/org/apache/commons/beanutils/locale/converters/SqlTimeLocaleConverter.java b/src/main/java/org/apache/commons/beanutils/locale/converters/SqlTimeLocaleConverter.java
index 27f073b8..eec7d149 100644
--- a/src/main/java/org/apache/commons/beanutils/locale/converters/SqlTimeLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils/locale/converters/SqlTimeLocaleConverter.java
@@ -34,7 +34,6 @@ import java.util.Locale;
 public class SqlTimeLocaleConverter extends DateLocaleConverter {
 
 
-    // ----------------------------------------------------------- Constructors
 
     /**
      * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
@@ -198,7 +197,6 @@ public class SqlTimeLocaleConverter extends DateLocaleConverter {
         super(defaultValue, locale, pattern, locPattern);
     }
 
-    // --------------------------------------------------------- Methods
 
     /**
      * Convert the specified locale-sensitive input object into an output object of the
diff --git a/src/main/java/org/apache/commons/beanutils/locale/converters/SqlTimestampLocaleConverter.java b/src/main/java/org/apache/commons/beanutils/locale/converters/SqlTimestampLocaleConverter.java
index a3a7ac9c..0d3936e8 100644
--- a/src/main/java/org/apache/commons/beanutils/locale/converters/SqlTimestampLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils/locale/converters/SqlTimestampLocaleConverter.java
@@ -34,7 +34,6 @@ import java.util.Locale;
 public class SqlTimestampLocaleConverter extends DateLocaleConverter {
 
 
-    // ----------------------------------------------------------- Constructors
 
     /**
      * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
@@ -197,7 +196,6 @@ public class SqlTimestampLocaleConverter extends DateLocaleConverter {
         super(defaultValue, locale, pattern, locPattern);
     }
 
-    // --------------------------------------------------------- Methods
 
     /**
      * Convert the specified locale-sensitive input object into an output object of the
diff --git a/src/main/java/org/apache/commons/beanutils/locale/converters/StringLocaleConverter.java b/src/main/java/org/apache/commons/beanutils/locale/converters/StringLocaleConverter.java
index 760145cb..d47fddc3 100644
--- a/src/main/java/org/apache/commons/beanutils/locale/converters/StringLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils/locale/converters/StringLocaleConverter.java
@@ -43,13 +43,11 @@ import java.util.Locale;
 
 public class StringLocaleConverter extends BaseLocaleConverter {
 
-    // ----------------------------------------------------- Instance Variables
 
     /** All logging goes through this logger */
     private final Log log = LogFactory.getLog(StringLocaleConverter.class);     //msz fix
 
 
-    // ----------------------------------------------------------- Constructors
 
     /**
      * Create a {@link org.apache.commons.beanutils.locale.LocaleConverter}
@@ -213,7 +211,6 @@ public class StringLocaleConverter extends BaseLocaleConverter {
         super(defaultValue, locale, pattern, locPattern);
     }
 
-    // --------------------------------------------------------- Methods
 
     /**
      * Convert the specified locale-sensitive input object into an output object of the
diff --git a/src/test/java/org/apache/commons/beanutils/BasicDynaBeanTestCase.java b/src/test/java/org/apache/commons/beanutils/BasicDynaBeanTestCase.java
index 696ddbcf..7fbd05ce 100644
--- a/src/test/java/org/apache/commons/beanutils/BasicDynaBeanTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/BasicDynaBeanTestCase.java
@@ -44,7 +44,6 @@ import junit.framework.TestSuite;
 public class BasicDynaBeanTestCase extends TestCase {
 
 
-    // ---------------------------------------------------- Instance Variables
 
 
     /**
@@ -78,7 +77,6 @@ public class BasicDynaBeanTestCase extends TestCase {
     };
 
 
-    // ---------------------------------------------------------- Constructors
 
 
     /**
@@ -93,7 +91,6 @@ public class BasicDynaBeanTestCase extends TestCase {
     }
 
 
-    // -------------------------------------------------- Overall Test Methods
 
 
     /**
@@ -167,7 +164,6 @@ public class BasicDynaBeanTestCase extends TestCase {
 
 
 
-    // ------------------------------------------------ Individual Test Methods
 
 
     /**
@@ -972,7 +968,6 @@ public class BasicDynaBeanTestCase extends TestCase {
     }
 
 
-    // ------------------------------------------------------ Protected Methods
 
 
     /**
diff --git a/src/test/java/org/apache/commons/beanutils/BeanComparatorTestCase.java b/src/test/java/org/apache/commons/beanutils/BeanComparatorTestCase.java
index cc3c3ab6..e8e2b183 100644
--- a/src/test/java/org/apache/commons/beanutils/BeanComparatorTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/BeanComparatorTestCase.java
@@ -31,7 +31,6 @@ import junit.framework.TestSuite;
 
 public class BeanComparatorTestCase extends TestCase {
 
-    // ---------------------------------------------------- Instance Variables
 
     /**
      * The test beans for each test.
@@ -41,7 +40,6 @@ public class BeanComparatorTestCase extends TestCase {
     protected AlphaBean alphaBean2 = null;
 
 
-    // ---------------------------------------------------------- Constructors
 
     /**
      * Construct a new instance of this test case.
@@ -53,7 +51,6 @@ public class BeanComparatorTestCase extends TestCase {
     }
 
 
-    // -------------------------------------------------- Overall Test Methods
 
 
     /**
@@ -87,7 +84,6 @@ public class BeanComparatorTestCase extends TestCase {
     }
 
 
-    // ------------------------------------------------ Individual Test Methods
 
 
     /**
diff --git a/src/test/java/org/apache/commons/beanutils/BeanUtils2TestCase.java b/src/test/java/org/apache/commons/beanutils/BeanUtils2TestCase.java
index ea120dcd..4c8c75f1 100644
--- a/src/test/java/org/apache/commons/beanutils/BeanUtils2TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/BeanUtils2TestCase.java
@@ -25,7 +25,6 @@ import junit.framework.TestSuite;
  */
 public class BeanUtils2TestCase extends BeanUtilsTestCase {
 
-    // ---------------------------------------------------------- Constructors
 
     /**
      * Construct a new instance of this test case.
@@ -37,7 +36,6 @@ public class BeanUtils2TestCase extends BeanUtilsTestCase {
     }
 
 
-    // -------------------------------------------------- Overall Test Methods
 
 
     /**
diff --git a/src/test/java/org/apache/commons/beanutils/BeanUtilsBenchCase.java b/src/test/java/org/apache/commons/beanutils/BeanUtilsBenchCase.java
index 34e93639..4fe6cea6 100644
--- a/src/test/java/org/apache/commons/beanutils/BeanUtilsBenchCase.java
+++ b/src/test/java/org/apache/commons/beanutils/BeanUtilsBenchCase.java
@@ -36,7 +36,6 @@ import junit.framework.TestSuite;
 public class BeanUtilsBenchCase extends TestCase {
 
 
-    // ------------------------------------------------------------ Constructors
 
 
     /**
@@ -51,7 +50,6 @@ public class BeanUtilsBenchCase extends TestCase {
     }
 
 
-    // ------------------------------------------------------ Instance Variables
 
 
     // Basic loop counter
@@ -74,7 +72,6 @@ public class BeanUtilsBenchCase extends TestCase {
     private BeanUtilsBean bu = null;
 
 
-    // ---------------------------------------------------- Overall Test Methods
 
 
     /**
@@ -168,7 +165,6 @@ public class BeanUtilsBenchCase extends TestCase {
 
 
 
-    // ------------------------------------------------- Individual Test Methods
 
 
     // Time copyProperties() from a bean
@@ -370,7 +366,6 @@ public class BeanUtilsBenchCase extends TestCase {
     }
 
 
-    // --------------------------------------------------------- Support Methods
 
 
 }
diff --git a/src/test/java/org/apache/commons/beanutils/BeanUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils/BeanUtilsTestCase.java
index d1d1b6b8..3a37eda6 100644
--- a/src/test/java/org/apache/commons/beanutils/BeanUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/BeanUtilsTestCase.java
@@ -62,7 +62,6 @@ import org.apache.commons.beanutils.converters.DateConverter;
 
 public class BeanUtilsTestCase extends TestCase {
 
-    // ---------------------------------------------------- Instance Variables
 
     /**
      * The test bean for each test.
@@ -105,7 +104,6 @@ public class BeanUtilsTestCase extends TestCase {
     /** Test String Date value */
     protected String testStringDate;
 
-    // ---------------------------------------------------------- Constructors
 
     /**
      * Construct a new instance of this test case.
@@ -117,7 +115,6 @@ public class BeanUtilsTestCase extends TestCase {
     }
 
 
-    // -------------------------------------------------- Overall Test Methods
 
 
     /**
@@ -169,7 +166,6 @@ public class BeanUtilsTestCase extends TestCase {
     }
 
 
-    // ------------------------------------------------ Individual Test Methods
 
 
     /**
diff --git a/src/test/java/org/apache/commons/beanutils/BeanificationTestCase.java b/src/test/java/org/apache/commons/beanutils/BeanificationTestCase.java
index c40585f7..ce493037 100644
--- a/src/test/java/org/apache/commons/beanutils/BeanificationTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/BeanificationTestCase.java
@@ -37,15 +37,12 @@ import org.apache.commons.logging.LogFactory;
 
 public class BeanificationTestCase extends TestCase {
 
-    // ---------------------------------------------------- Constants
 
     /** Maximum number of iterations before our test fails */
     public static final int MAX_GC_ITERATIONS = 50;
 
-    // ---------------------------------------------------- Instance Variables
 
 
-    // ---------------------------------------------------------- Constructors
 
 
     /**
@@ -58,7 +55,6 @@ public class BeanificationTestCase extends TestCase {
     }
 
 
-    // -------------------------------------------------- Overall Test Methods
 
 
     /**
@@ -89,7 +85,6 @@ public class BeanificationTestCase extends TestCase {
     }
 
 
-    // ------------------------------------------------ Individual Test Methods
 
     /** Test of the methodology we'll use for some of the later tests */
     public void testMemoryTestMethodology() throws Exception {
@@ -476,7 +471,6 @@ public class BeanificationTestCase extends TestCase {
         assertTrue("Unset works", !beanOne.equals(ccll.get()));
     }
 
-    // ---- Auxillary classes
 
     class TestClassLoader extends ClassLoader {
         @Override
diff --git a/src/test/java/org/apache/commons/beanutils/BenchBean.java b/src/test/java/org/apache/commons/beanutils/BenchBean.java
index 54db254a..d0e4b161 100644
--- a/src/test/java/org/apache/commons/beanutils/BenchBean.java
+++ b/src/test/java/org/apache/commons/beanutils/BenchBean.java
@@ -27,7 +27,6 @@ package org.apache.commons.beanutils;
 public class BenchBean {
 
 
-    // -------------------------------------------------------------- Properties
 
 
     /**
diff --git a/src/test/java/org/apache/commons/beanutils/ConstructorUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils/ConstructorUtilsTestCase.java
index 5818eb3d..f39ab28b 100644
--- a/src/test/java/org/apache/commons/beanutils/ConstructorUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/ConstructorUtilsTestCase.java
@@ -33,7 +33,6 @@ import junit.framework.TestSuite;
  */
 public class ConstructorUtilsTestCase extends TestCase {
 
-    // ---------------------------------------------------------- Constructors
 
     /**
      * Construct a new instance of this test case.
@@ -45,7 +44,6 @@ public class ConstructorUtilsTestCase extends TestCase {
     }
 
 
-    // -------------------------------------------------- Overall Test Methods
 
 
     /**
@@ -73,7 +71,6 @@ public class ConstructorUtilsTestCase extends TestCase {
     }
 
 
-    // ------------------------------------------------ Individual Test Methods
 
     public void testInvokeConstructor() throws Exception {
         {
diff --git a/src/test/java/org/apache/commons/beanutils/ConvertUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils/ConvertUtilsTestCase.java
index c4e71897..e466a735 100644
--- a/src/test/java/org/apache/commons/beanutils/ConvertUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/ConvertUtilsTestCase.java
@@ -41,10 +41,8 @@ import org.apache.commons.beanutils.converters.DateConverter;
 
 public class ConvertUtilsTestCase extends TestCase {
 
-    // ---------------------------------------------------- Instance Variables
 
 
-    // ---------------------------------------------------------- Constructors
 
 
     /**
@@ -57,7 +55,6 @@ public class ConvertUtilsTestCase extends TestCase {
     }
 
 
-    // -------------------------------------------------- Overall Test Methods
 
 
     /**
@@ -88,7 +85,6 @@ public class ConvertUtilsTestCase extends TestCase {
     }
 
 
-    // ------------------------------------------------ Individual Test Methods
 
 
     /**
@@ -671,7 +667,6 @@ public class ConvertUtilsTestCase extends TestCase {
                 utils.convert(value, getClass()));
     }
 
-    // -------------------------------------------------------- Private Methods
 
 
     private void checkIntegerArray(final Object value, final int intArray[]) {
diff --git a/src/test/java/org/apache/commons/beanutils/DynaBeanMapDecoratorTestCase.java b/src/test/java/org/apache/commons/beanutils/DynaBeanMapDecoratorTestCase.java
index 9db9f8f8..1fe9f213 100644
--- a/src/test/java/org/apache/commons/beanutils/DynaBeanMapDecoratorTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/DynaBeanMapDecoratorTestCase.java
@@ -57,7 +57,6 @@ public class DynaBeanMapDecoratorTestCase extends TestCase {
     private Map<Object, Object> modifiableMap;
     private static final Map<Object, Object> emptyMap = new DynaBeanMapDecorator(new BasicDynaBean(new BasicDynaClass()));
 
-    // ---------------------------------------------------------- Constructors
 
     /**
      * Construct a new instance of this test case.
@@ -68,7 +67,6 @@ public class DynaBeanMapDecoratorTestCase extends TestCase {
         super(name);
     }
 
-    // -------------------------------------------------- Overall Test Methods
 
     /**
      * Run thus Test
@@ -116,7 +114,6 @@ public class DynaBeanMapDecoratorTestCase extends TestCase {
         modifiableMap = null;
     }
 
-    // ------------------------------------------------ Individual Test Methods
 
     /**
      * Test isReadOnly() method
diff --git a/src/test/java/org/apache/commons/beanutils/DynaBeanUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils/DynaBeanUtilsTestCase.java
index 95537a7e..c61613a9 100644
--- a/src/test/java/org/apache/commons/beanutils/DynaBeanUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/DynaBeanUtilsTestCase.java
@@ -37,7 +37,6 @@ import junit.framework.TestSuite;
 public class DynaBeanUtilsTestCase extends TestCase {
 
 
-    // ----------------------------------------------------- Instance Variables
 
 
     /**
@@ -80,7 +79,6 @@ public class DynaBeanUtilsTestCase extends TestCase {
     };
 
 
-    // ----------------------------------------------------------- Constructors
 
 
     /**
@@ -95,7 +93,6 @@ public class DynaBeanUtilsTestCase extends TestCase {
     }
 
 
-    // --------------------------------------------------- Overall Test Methods
 
 
     /**
@@ -181,7 +178,6 @@ public class DynaBeanUtilsTestCase extends TestCase {
 
 
 
-    // ------------------------------------------------ Individual Test Methods
 
     /**
      * Test the cloneBean() method from a DynaBean.
@@ -1196,7 +1192,6 @@ public class DynaBeanUtilsTestCase extends TestCase {
     }
 
 
-    // ------------------------------------------------------ Protected Methods
 
 
     // Ensure that the nested intArray matches the specified values
diff --git a/src/test/java/org/apache/commons/beanutils/DynaPropertyUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils/DynaPropertyUtilsTestCase.java
index 98bdf0fa..c1b94ce9 100644
--- a/src/test/java/org/apache/commons/beanutils/DynaPropertyUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/DynaPropertyUtilsTestCase.java
@@ -38,7 +38,6 @@ import junit.framework.TestSuite;
 public class DynaPropertyUtilsTestCase extends TestCase {
 
 
-    // ----------------------------------------------------- Instance Variables
 
 
     /**
@@ -79,7 +78,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
     protected TestBean nested = null;
 
 
-    // ----------------------------------------------------------- Constructors
 
 
     /**
@@ -94,7 +92,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
     }
 
 
-    // --------------------------------------------------- Overall Test Methods
 
 
     /**
@@ -179,7 +176,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
 
 
 
-    // ------------------------------------------------ Individual Test Methods
 
 
     /**
@@ -2599,7 +2595,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
     }
 
 
-    // ------------------------------------------------------ Protected Methods
 
 
     /**
diff --git a/src/test/java/org/apache/commons/beanutils/DynaResultSetTestCase.java b/src/test/java/org/apache/commons/beanutils/DynaResultSetTestCase.java
index 38d8bafc..59000513 100644
--- a/src/test/java/org/apache/commons/beanutils/DynaResultSetTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/DynaResultSetTestCase.java
@@ -35,7 +35,6 @@ import junit.framework.TestSuite;
 public class DynaResultSetTestCase extends TestCase {
 
 
-    // ----------------------------------------------------- Instance Variables
 
 
     /**
@@ -58,7 +57,6 @@ public class DynaResultSetTestCase extends TestCase {
       "timestampproperty" };
 
 
-    // ----------------------------------------------------------- Constructors
 
 
     /**
@@ -73,7 +71,6 @@ public class DynaResultSetTestCase extends TestCase {
     }
 
 
-    // --------------------------------------------------- Overall Test Methods
 
 
     /**
@@ -109,7 +106,6 @@ public class DynaResultSetTestCase extends TestCase {
 
 
 
-    // ------------------------------------------------ Individual Test Methods
 
 
     public void testGetName() {
diff --git a/src/test/java/org/apache/commons/beanutils/DynaRowSetTestCase.java b/src/test/java/org/apache/commons/beanutils/DynaRowSetTestCase.java
index e1600226..92e18932 100644
--- a/src/test/java/org/apache/commons/beanutils/DynaRowSetTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/DynaRowSetTestCase.java
@@ -38,7 +38,6 @@ import junit.framework.TestSuite;
 public class DynaRowSetTestCase extends TestCase {
 
 
-    // ----------------------------------------------------- Instance Variables
 
 
     /**
@@ -61,7 +60,6 @@ public class DynaRowSetTestCase extends TestCase {
       "timestampproperty" };
 
 
-    // ----------------------------------------------------------- Constructors
 
 
     /**
@@ -76,7 +74,6 @@ public class DynaRowSetTestCase extends TestCase {
     }
 
 
-    // --------------------------------------------------- Overall Test Methods
 
 
     /**
@@ -112,7 +109,6 @@ public class DynaRowSetTestCase extends TestCase {
 
 
 
-    // ------------------------------------------------ Individual Test Methods
 
 
     public void testGetName() {
diff --git a/src/test/java/org/apache/commons/beanutils/IndexedPropertyTestCase.java b/src/test/java/org/apache/commons/beanutils/IndexedPropertyTestCase.java
index 3fe630ab..32287ac7 100644
--- a/src/test/java/org/apache/commons/beanutils/IndexedPropertyTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/IndexedPropertyTestCase.java
@@ -39,7 +39,6 @@ import org.junit.Test;
 
 public class IndexedPropertyTestCase {
 
-    // ---------------------------------------------------- Instance Variables
 
     /**
      * The test bean for each test.
@@ -54,7 +53,6 @@ public class IndexedPropertyTestCase {
     private ArrayList<Object> arrayList;
 
 
-    // -------------------------------------------------- Overall Test Methods
 
 
     /**
@@ -102,7 +100,6 @@ public class IndexedPropertyTestCase {
     }
 
 
-    // ------------------------------------------------ Individual Test Methods
 
     /**
      * Test IndexedPropertyDescriptor for an Array
diff --git a/src/test/java/org/apache/commons/beanutils/IndexedTestBean.java b/src/test/java/org/apache/commons/beanutils/IndexedTestBean.java
index 8cad9006..db541a52 100644
--- a/src/test/java/org/apache/commons/beanutils/IndexedTestBean.java
+++ b/src/test/java/org/apache/commons/beanutils/IndexedTestBean.java
@@ -31,7 +31,6 @@ public class IndexedTestBean {
     private ArrayList<Object> arrayList;
 
 
-    // ----------------------------------------------------------- Constructors
 
     /**
      * Default Constructor.
diff --git a/src/test/java/org/apache/commons/beanutils/LazyDynaBeanTestCase.java b/src/test/java/org/apache/commons/beanutils/LazyDynaBeanTestCase.java
index 7972b000..aa0046bc 100644
--- a/src/test/java/org/apache/commons/beanutils/LazyDynaBeanTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/LazyDynaBeanTestCase.java
@@ -43,7 +43,6 @@ public class LazyDynaBeanTestCase extends TestCase {
     protected Integer testInteger2    = Integer.valueOf(40);
     protected String testKey          = "myKey";
 
-    // ---------------------------------------------------------- Constructors
 
     /**
      * Construct a new instance of this test case.
@@ -54,7 +53,6 @@ public class LazyDynaBeanTestCase extends TestCase {
         super(name);
     }
 
-    // -------------------------------------------------- Overall Test Methods
 
     /**
      * Run thus Test
@@ -88,7 +86,6 @@ public class LazyDynaBeanTestCase extends TestCase {
       bean = null;
     }
 
-    // ------------------------------------------------ Individual Test Methods
 
     /**
      * Test Getting/Setting a Simple Property
diff --git a/src/test/java/org/apache/commons/beanutils/LazyDynaClassTestCase.java b/src/test/java/org/apache/commons/beanutils/LazyDynaClassTestCase.java
index 248250be..3b4afd2e 100644
--- a/src/test/java/org/apache/commons/beanutils/LazyDynaClassTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/LazyDynaClassTestCase.java
@@ -29,7 +29,6 @@ public class LazyDynaClassTestCase extends TestCase {
     protected LazyDynaClass dynaClass = null;
     protected String testProperty     = "myProperty";
 
-    // ---------------------------------------------------------- Constructors
 
     /**
      * Construct a new instance of this test case.
@@ -40,7 +39,6 @@ public class LazyDynaClassTestCase extends TestCase {
         super(name);
     }
 
-    // -------------------------------------------------- Overall Test Methods
 
     /**
      * Run this Test
@@ -72,7 +70,6 @@ public class LazyDynaClassTestCase extends TestCase {
         dynaClass = null;
     }
 
-    // ------------------------------------------------ Individual Test Methods
 
     /**
      * Test add(name) method
diff --git a/src/test/java/org/apache/commons/beanutils/LazyDynaListTestCase.java b/src/test/java/org/apache/commons/beanutils/LazyDynaListTestCase.java
index 588aab5a..32ced4ea 100644
--- a/src/test/java/org/apache/commons/beanutils/LazyDynaListTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/LazyDynaListTestCase.java
@@ -48,7 +48,6 @@ public class LazyDynaListTestCase extends TestCase {
     protected DynaClass pojoDynaClass = new WrapDynaBean(new TestBean()).getDynaClass();
     protected DynaClass basicDynaClass = new BasicDynaClass("test", BasicDynaBean.class, properties);
 
-    // ---------------------------------------------------------- Constructors
 
     /**
      * Construct a new instance of this test case.
@@ -59,7 +58,6 @@ public class LazyDynaListTestCase extends TestCase {
         super(name);
     }
 
-    // -------------------------------------------------- Overall Test Methods
 
     /**
      * Run thus Test
@@ -89,7 +87,6 @@ public class LazyDynaListTestCase extends TestCase {
     public void tearDown() {
     }
 
-    // ------------------------------------------------ Individual Test Methods
 
     /**
      * Test DynaBean Create
@@ -176,7 +173,6 @@ public class LazyDynaListTestCase extends TestCase {
      */
     public void testCollection(final LazyDynaList list, final Class<?> testClass, final DynaClass testDynaClass, final Object wrongBean) {
 
-        // ----- Create Collection & Array of Maps -----
         final int size = 5;
         final List<Object> testList = new ArrayList<Object>(size);
         final TreeMap<?, ?>[] testArray = new TreeMap[size];
@@ -188,7 +184,6 @@ public class LazyDynaListTestCase extends TestCase {
         }
 
 
-        // ----- Create LazyArrayList from Collection -----
         LazyDynaList lazyList = new LazyDynaList(testList);
         assertEquals("1. check size", size, lazyList.size());
 
@@ -205,7 +200,6 @@ public class LazyDynaListTestCase extends TestCase {
 
 
 
-        // ----- Create LazyArrayList from Array -----
         lazyList = new LazyDynaList(testArray);
         assertEquals("6. check size", size, lazyList.size());
 
diff --git a/src/test/java/org/apache/commons/beanutils/LazyDynaMapTestCase.java b/src/test/java/org/apache/commons/beanutils/LazyDynaMapTestCase.java
index cfac0345..2bf11027 100644
--- a/src/test/java/org/apache/commons/beanutils/LazyDynaMapTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/LazyDynaMapTestCase.java
@@ -44,7 +44,6 @@ public class LazyDynaMapTestCase extends TestCase {
     protected Integer testInteger2    = new Integer(40);
     protected String testKey          = "myKey";
 
-    // ---------------------------------------------------------- Constructors
 
     /**
      * Construct a new instance of this test case.
@@ -55,7 +54,6 @@ public class LazyDynaMapTestCase extends TestCase {
         super(name);
     }
 
-    // -------------------------------------------------- Overall Test Methods
 
     /**
      * Run thus Test
@@ -88,7 +86,6 @@ public class LazyDynaMapTestCase extends TestCase {
       dynaMap = null;
     }
 
-    // ------------------------------------------------ Individual Test Methods
 
     /**
      * General Tests
diff --git a/src/test/java/org/apache/commons/beanutils/MappedPropertyTestBean.java b/src/test/java/org/apache/commons/beanutils/MappedPropertyTestBean.java
index fbc41c02..7fe1edd8 100644
--- a/src/test/java/org/apache/commons/beanutils/MappedPropertyTestBean.java
+++ b/src/test/java/org/apache/commons/beanutils/MappedPropertyTestBean.java
@@ -32,7 +32,6 @@ public class MappedPropertyTestBean {
     private final Map<Object, Object> myMap = new HashMap<>();
 
 
-    // -------------------------------------------------------------- Properties
 
     public String getMapproperty(final String key) {
         return (String) map.get(key);
diff --git a/src/test/java/org/apache/commons/beanutils/MappedPropertyTestCase.java b/src/test/java/org/apache/commons/beanutils/MappedPropertyTestCase.java
index b4e782d1..5bdab3f3 100644
--- a/src/test/java/org/apache/commons/beanutils/MappedPropertyTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/MappedPropertyTestCase.java
@@ -26,7 +26,6 @@ import junit.framework.TestSuite;
  */
 public class MappedPropertyTestCase extends TestCase {
 
-    // ---------------------------------------------------------- Constructors
 
     /**
      * Construct a new instance of this test case.
@@ -37,7 +36,6 @@ public class MappedPropertyTestCase extends TestCase {
         super(name);
     }
 
-    // -------------------------------------------------- Overall Test Methods
 
     /**
      * Run this Test
@@ -67,7 +65,6 @@ public class MappedPropertyTestCase extends TestCase {
     public void tearDown() {
     }
 
-    // ------------------------------------------------ Individual Test Methods
 
     /**
      * Test valid method name
diff --git a/src/test/java/org/apache/commons/beanutils/MethodUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils/MethodUtilsTestCase.java
index 938e92f1..4d2ac4fc 100644
--- a/src/test/java/org/apache/commons/beanutils/MethodUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/MethodUtilsTestCase.java
@@ -34,7 +34,6 @@ import org.apache.commons.beanutils.priv.PublicSubBean;
  */
 public class MethodUtilsTestCase extends TestCase {
 
-    // ---------------------------------------------------------- Constructors
 
     /**
      * Construct a new instance of this test case.
@@ -46,7 +45,6 @@ public class MethodUtilsTestCase extends TestCase {
     }
 
 
-    // -------------------------------------------------- Overall Test Methods
 
 
     /**
@@ -72,7 +70,6 @@ public class MethodUtilsTestCase extends TestCase {
     }
 
 
-    // ------------------------------------------------ Individual Test Methods
 
     /**
      * <p> Test <code>getAccessibleMethod</code>.
diff --git a/src/test/java/org/apache/commons/beanutils/NestedTestBean.java b/src/test/java/org/apache/commons/beanutils/NestedTestBean.java
index e1b746bf..e6771f33 100644
--- a/src/test/java/org/apache/commons/beanutils/NestedTestBean.java
+++ b/src/test/java/org/apache/commons/beanutils/NestedTestBean.java
@@ -28,13 +28,11 @@ package org.apache.commons.beanutils;
 public class NestedTestBean {
 
 
-    // ------------------------------------------------------------- Constructors
     public NestedTestBean(final String name) {
         setName(name);
     }
 
 
-    // ------------------------------------------------------------- Properties
 
     private String name;
 
@@ -96,6 +94,5 @@ public class NestedTestBean {
         return simpleBean;
     }
 
-    // ------------------------------------------------------- Static Variables
 
 }
diff --git a/src/test/java/org/apache/commons/beanutils/PropertyUtilsBenchCase.java b/src/test/java/org/apache/commons/beanutils/PropertyUtilsBenchCase.java
index c618fd68..cd389313 100644
--- a/src/test/java/org/apache/commons/beanutils/PropertyUtilsBenchCase.java
+++ b/src/test/java/org/apache/commons/beanutils/PropertyUtilsBenchCase.java
@@ -35,7 +35,6 @@ import junit.framework.TestSuite;
 public class PropertyUtilsBenchCase extends TestCase {
 
 
-    // ------------------------------------------------------------ Constructors
 
 
     /**
@@ -50,7 +49,6 @@ public class PropertyUtilsBenchCase extends TestCase {
     }
 
 
-    // ------------------------------------------------------ Instance Variables
 
 
     // Basic loop counter
@@ -72,7 +70,6 @@ public class PropertyUtilsBenchCase extends TestCase {
     private PropertyUtilsBean pu = null;
 
 
-    // ---------------------------------------------------- Overall Test Methods
 
 
     /**
@@ -159,7 +156,6 @@ public class PropertyUtilsBenchCase extends TestCase {
 
 
 
-    // ------------------------------------------------- Individual Test Methods
 
 
     // Time copyProperties() from a bean
@@ -261,7 +257,6 @@ public class PropertyUtilsBenchCase extends TestCase {
     }
 
 
-    // --------------------------------------------------------- Support Methods
 
 
 }
diff --git a/src/test/java/org/apache/commons/beanutils/PropertyUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils/PropertyUtilsTestCase.java
index 74b6f2ad..1103cae6 100644
--- a/src/test/java/org/apache/commons/beanutils/PropertyUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/PropertyUtilsTestCase.java
@@ -70,7 +70,6 @@ import org.apache.commons.beanutils.priv.PublicSubBean;
 public class PropertyUtilsTestCase extends TestCase {
 
 
-    // ---------------------------------------------------- Instance Variables
 
 
     /**
@@ -179,7 +178,6 @@ public class PropertyUtilsTestCase extends TestCase {
     };
 
 
-    // ---------------------------------------------------------- Constructors
 
 
     /**
@@ -194,7 +192,6 @@ public class PropertyUtilsTestCase extends TestCase {
     }
 
 
-    // -------------------------------------------------- Overall Test Methods
 
 
     /**
@@ -249,7 +246,6 @@ public class PropertyUtilsTestCase extends TestCase {
 
 
 
-    // ------------------------------------------------ Individual Test Methods
 
 
     /**
@@ -3227,7 +3223,6 @@ public class PropertyUtilsTestCase extends TestCase {
     public void testSetMappedPeriods() {
 
 
-        // -------- PropertyUtils.setMappedProperty()--------
         bean.setMappedProperty("key.with.a.dot", "Special Value");
         assertEquals("Can retrieve directly (A)",
                      "Special Value",
@@ -3242,7 +3237,6 @@ public class PropertyUtilsTestCase extends TestCase {
             fail("Thew exception: " + e);
         }
 
-        // -------- PropertyUtils.setNestedProperty() --------
         bean.setMappedProperty("key.with.a.dot", "Special Value");
         assertEquals("Can retrieve directly (B)",
                      "Special Value",
@@ -3257,7 +3251,6 @@ public class PropertyUtilsTestCase extends TestCase {
         }
 
 
-        // -------- PropertyUtils.setNestedProperty() --------
         final TestBean testBean = new TestBean();
         bean.setMappedObjects("nested.property", testBean);
         assertEquals("Can retrieve directly (C)",
@@ -3273,7 +3266,6 @@ public class PropertyUtilsTestCase extends TestCase {
             fail("Thew exception: " + e);
         }
 
-        // -------- PropertyUtils.setNestedProperty() --------
         bean.getNested().setMappedProperty("Mapped Key", "Nested Mapped Value");
         try {
             assertEquals("Can retrieve via getNestedProperty (D)",
@@ -3930,7 +3922,6 @@ public class PropertyUtilsTestCase extends TestCase {
     }
 
 
-    // ------------------------------------------------------ Protected Methods
 
 
     /**
diff --git a/src/test/java/org/apache/commons/beanutils/TestBean.java b/src/test/java/org/apache/commons/beanutils/TestBean.java
index ad6f65ea..c8a0cd41 100644
--- a/src/test/java/org/apache/commons/beanutils/TestBean.java
+++ b/src/test/java/org/apache/commons/beanutils/TestBean.java
@@ -33,7 +33,6 @@ import java.util.Map;
 
 public class TestBean implements Serializable {
 
-    // ----------------------------------------------------------- Constructors
 
     private static final long serialVersionUID = 1L;
 
@@ -102,7 +101,6 @@ public class TestBean implements Serializable {
         this.string2dArray = string2dArray;
     }
 
-    // ------------------------------------------------------------- Properties
 
 
     /**
@@ -546,7 +544,6 @@ public class TestBean implements Serializable {
     }
 
 
-    // ------------------------------------------------------ Invalid Properties
 
 
     /**
@@ -577,7 +574,6 @@ public class TestBean implements Serializable {
 
 
 
-    // ------------------------------------------------------- Static Variables
 
 
     /**
diff --git a/src/test/java/org/apache/commons/beanutils/TestResultSet.java b/src/test/java/org/apache/commons/beanutils/TestResultSet.java
index 99f90969..41702a94 100644
--- a/src/test/java/org/apache/commons/beanutils/TestResultSet.java
+++ b/src/test/java/org/apache/commons/beanutils/TestResultSet.java
@@ -51,7 +51,6 @@ import java.util.Map;
 public class TestResultSet implements InvocationHandler {
 
 
-    // ----------------------------------------------------- Instance Variables
 
 
     /**
@@ -148,7 +147,6 @@ public class TestResultSet implements InvocationHandler {
         return (String)arg;
     }
 
-    // ---------------------------------------------------- Implemented Methods
 
 
     public void close() throws SQLException {
@@ -230,7 +228,6 @@ public class TestResultSet implements InvocationHandler {
     }
 
 
-    // -------------------------------------------------- Unimplemented Methods
 
 
     public boolean absolute(final int row) throws SQLException {
diff --git a/src/test/java/org/apache/commons/beanutils/TestResultSetMetaData.java b/src/test/java/org/apache/commons/beanutils/TestResultSetMetaData.java
index 9b15332c..038e41ff 100644
--- a/src/test/java/org/apache/commons/beanutils/TestResultSetMetaData.java
+++ b/src/test/java/org/apache/commons/beanutils/TestResultSetMetaData.java
@@ -37,7 +37,6 @@ import java.sql.Types;
 public class TestResultSetMetaData implements InvocationHandler {
 
 
-    // ----------------------------------------------------- Instance Variables
 
 
     /**
@@ -105,7 +104,6 @@ public class TestResultSetMetaData implements InvocationHandler {
         throw new UnsupportedOperationException(methodName + " not implemented");
     }
 
-    // ---------------------------------------------------- Implemented Methods
 
 
     public String getColumnClassName(final int columnIndex) throws SQLException {
@@ -159,7 +157,6 @@ public class TestResultSetMetaData implements InvocationHandler {
     }
 
 
-    // -------------------------------------------------- Unimplemented Methods
 
 
     public String getCatalogName(final int columnIndex) throws SQLException {
diff --git a/src/test/java/org/apache/commons/beanutils/WrapDynaBeanTestCase.java b/src/test/java/org/apache/commons/beanutils/WrapDynaBeanTestCase.java
index b52fa9a2..7a048ec1 100644
--- a/src/test/java/org/apache/commons/beanutils/WrapDynaBeanTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/WrapDynaBeanTestCase.java
@@ -37,10 +37,8 @@ import junit.framework.TestSuite;
 public class WrapDynaBeanTestCase extends BasicDynaBeanTestCase {
 
 
-    // ---------------------------------------------------- Instance Variables
 
 
-    // ---------------------------------------------------------- Constructors
 
 
     /**
@@ -55,7 +53,6 @@ public class WrapDynaBeanTestCase extends BasicDynaBeanTestCase {
     }
 
 
-    // -------------------------------------------------- Overall Test Methods
 
 
     /**
@@ -91,7 +88,6 @@ public class WrapDynaBeanTestCase extends BasicDynaBeanTestCase {
 
 
 
-    // ------------------------------------------------ Individual Test Methods
 
 
     /**
diff --git a/src/test/java/org/apache/commons/beanutils/converters/DateConverterTestBase.java b/src/test/java/org/apache/commons/beanutils/converters/DateConverterTestBase.java
index 847c47fc..6cdf5837 100644
--- a/src/test/java/org/apache/commons/beanutils/converters/DateConverterTestBase.java
+++ b/src/test/java/org/apache/commons/beanutils/converters/DateConverterTestBase.java
@@ -518,7 +518,6 @@ public abstract class DateConverterTestBase extends TestCase {
     long getTimeInMillis(final Object date) {
 
         if (date instanceof java.sql.Timestamp) {
-            // ---------------------- JDK 1.3 Fix ----------------------
             // N.B. Prior to JDK 1.4 the Timestamp's getTime() method
             //      didn't include the milliseconds. The following code
             //      ensures it works consistently accross JDK versions
diff --git a/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsTestCase.java
index d15956d0..8b491588 100644
--- a/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsTestCase.java
@@ -42,7 +42,6 @@ public class LocaleBeanUtilsTestCase extends TestCase {
     }
 
 
-    // -------------------------------------------------- Overall Test Methods
 
 
     /**
@@ -70,7 +69,6 @@ public class LocaleBeanUtilsTestCase extends TestCase {
     }
 
 
-    // ------------------------------------------------ Individual Test Methods
 
     /**
      * Test setting a nested simple property
diff --git a/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanificationTestCase.java b/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanificationTestCase.java
index a5ea4483..145ad654 100644
--- a/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanificationTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanificationTestCase.java
@@ -45,15 +45,12 @@ import org.apache.commons.logging.LogFactory;
 
 public class LocaleBeanificationTestCase extends TestCase {
 
-    // ---------------------------------------------------- Constants
 
     /** Maximum number of iterations before our test fails */
     public static final int MAX_GC_ITERATIONS = 50;
 
-    // ---------------------------------------------------- Instance Variables
 
 
-    // ---------------------------------------------------------- Constructors
 
 
     /**
@@ -66,7 +63,6 @@ public class LocaleBeanificationTestCase extends TestCase {
     }
 
 
-    // -------------------------------------------------- Overall Test Methods
 
 
     /**
@@ -97,7 +93,6 @@ public class LocaleBeanificationTestCase extends TestCase {
     }
 
 
-    // ------------------------------------------------ Individual Test Methods
 
     /** Test of the methodology we'll use for some of the later tests */
     public void testMemoryTestMethodology() throws Exception {
@@ -518,7 +513,6 @@ public class LocaleBeanificationTestCase extends TestCase {
         }
     }
 
-    // ---- Auxillary classes
 
     class TestClassLoader extends ClassLoader {
         @Override
diff --git a/src/test/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsTestCase.java
index 1160d8a0..d796e847 100644
--- a/src/test/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsTestCase.java
@@ -42,11 +42,9 @@ import org.apache.commons.beanutils.ConversionException;
 
 public class LocaleConvertUtilsTestCase extends TestCase {
 
-    // ---------------------------------------------------- Instance Variables
 
     private char m_decimalSeparator;
 
-    // ---------------------------------------------------------- Constructors
 
 
     /**
@@ -59,7 +57,6 @@ public class LocaleConvertUtilsTestCase extends TestCase {
     }
 
 
-    // -------------------------------------------------- Overall Test Methods
 
 
     /**
@@ -97,7 +94,6 @@ public class LocaleConvertUtilsTestCase extends TestCase {
     }
 
 
-    // ------------------------------------------------ Individual Test Methods
 
 
     /**
@@ -637,7 +633,6 @@ public class LocaleConvertUtilsTestCase extends TestCase {
                 LocaleConvertUtils.convert(value.toString(), getClass()));
     }
 
-    // -------------------------------------------------------- Private Methods
 
 
     private void checkIntegerArray(final Object value, final int intArray[]) {
diff --git a/src/test/java/org/apache/commons/beanutils/locale/converters/BaseLocaleConverterTestCase.java b/src/test/java/org/apache/commons/beanutils/locale/converters/BaseLocaleConverterTestCase.java
index 80ab9b37..e58c4857 100644
--- a/src/test/java/org/apache/commons/beanutils/locale/converters/BaseLocaleConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/locale/converters/BaseLocaleConverterTestCase.java
@@ -62,13 +62,11 @@ public class BaseLocaleConverterTestCase extends TestCase {
     protected String expectedDecimalValue;
     protected String expectedIntegerValue;
 
-    // ---------------------------------------------------------- Constructors
 
     public BaseLocaleConverterTestCase(final String name) {
         super(name);
     }
 
-    // -------------------------------------------------- Overall Test Methods
 
     /**
      * Set up instance variables required by this test case.
@@ -133,7 +131,6 @@ public class BaseLocaleConverterTestCase extends TestCase {
     }
 
 
-    // -------------------------------------------------- Generic Test Methods
 
     /**
      * Test Converting Value WITH a pattern
diff --git a/src/test/java/org/apache/commons/beanutils/locale/converters/BigDecimalLocaleConverterTestCase.java b/src/test/java/org/apache/commons/beanutils/locale/converters/BigDecimalLocaleConverterTestCase.java
index b4b00d87..35babb54 100644
--- a/src/test/java/org/apache/commons/beanutils/locale/converters/BigDecimalLocaleConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/locale/converters/BigDecimalLocaleConverterTestCase.java
@@ -28,13 +28,11 @@ public class BigDecimalLocaleConverterTestCase extends BaseLocaleConverterTestCa
 
 
 
-    // ---------------------------------------------------------- Constructors
 
     public BigDecimalLocaleConverterTestCase(final String name) {
         super(name);
     }
 
-    // -------------------------------------------------- Overall Test Methods
 
     /**
      * Set up instance variables required by this test case.
@@ -65,7 +63,6 @@ public class BigDecimalLocaleConverterTestCase extends BaseLocaleConverterTestCa
      */
     public void testConstructorMain() {
 
-        // ------------- Construct with localized pattern ------------
         converter = new BigDecimalLocaleConverter(defaultValue,
                                                   localizedLocale,
                                                   localizedDecimalPattern,
@@ -107,7 +104,6 @@ public class BigDecimalLocaleConverterTestCase extends BaseLocaleConverterTestCa
         //convertValueToType(converter, "(B)", Double.class, localizedDecimalValue, localizedDecimalPattern, expectedValue);
 
 
-        // ------------- Construct with non-localized pattern ------------
         converter = new BigDecimalLocaleConverter(defaultValue,
                                                   localizedLocale,
                                                   defaultDecimalPattern,
@@ -129,7 +125,6 @@ public class BigDecimalLocaleConverterTestCase extends BaseLocaleConverterTestCa
      */
     public void testConstructor_2() {
 
-        // ------------- Construct using default locale ------------
         converter = new BigDecimalLocaleConverter();
 
         // Perform Tests
@@ -148,7 +143,6 @@ public class BigDecimalLocaleConverterTestCase extends BaseLocaleConverterTestCa
      */
     public void testConstructor_3() {
 
-        // ------------- Construct using localized pattern (default locale) --------
         converter = new BigDecimalLocaleConverter(true);
 
         // Perform Tests
@@ -165,7 +159,6 @@ public class BigDecimalLocaleConverterTestCase extends BaseLocaleConverterTestCa
      */
     public void testConstructor_4() {
 
-        // ------------- Construct using specified Locale --------
         converter = new BigDecimalLocaleConverter(localizedLocale);
 
         // Perform Tests
@@ -183,7 +176,6 @@ public class BigDecimalLocaleConverterTestCase extends BaseLocaleConverterTestCa
      */
     public void testConstructor_5() {
 
-        // ------------- Construct using specified Locale --------
         converter = new BigDecimalLocaleConverter(localizedLocale, true);
 
         // Perform Tests
@@ -200,7 +192,6 @@ public class BigDecimalLocaleConverterTestCase extends BaseLocaleConverterTestCa
      */
     public void testConstructor_6() {
 
-        // ------------- Construct using specified Locale --------
         converter = new BigDecimalLocaleConverter(localizedLocale, defaultDecimalPattern);
 
         // Perform Tests
@@ -216,7 +207,6 @@ public class BigDecimalLocaleConverterTestCase extends BaseLocaleConverterTestCa
      */
     public void testConstructor_7() {
 
-        // ------------- Construct using specified Locale --------
         converter = new BigDecimalLocaleConverter(localizedLocale, localizedDecimalPattern, true);
 
         // Perform Tests
@@ -232,7 +222,6 @@ public class BigDecimalLocaleConverterTestCase extends BaseLocaleConverterTestCa
      */
     public void testConstructor_8() {
 
-        // ------------- Construct using specified Locale --------
         converter = new BigDecimalLocaleConverter(defaultValue);
 
         // Perform Tests
@@ -248,7 +237,6 @@ public class BigDecimalLocaleConverterTestCase extends BaseLocaleConverterTestCa
      */
     public void testConstructor_9() {
 
-        // ------------- Construct using specified Locale --------
         converter = new BigDecimalLocaleConverter(defaultValue, true);
 
         // Perform Tests
diff --git a/src/test/java/org/apache/commons/beanutils/locale/converters/BigIntegerLocaleConverterTestCase.java b/src/test/java/org/apache/commons/beanutils/locale/converters/BigIntegerLocaleConverterTestCase.java
index 3ee4b442..1a5a1b12 100644
--- a/src/test/java/org/apache/commons/beanutils/locale/converters/BigIntegerLocaleConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/locale/converters/BigIntegerLocaleConverterTestCase.java
@@ -30,13 +30,11 @@ public class BigIntegerLocaleConverterTestCase extends BaseLocaleConverterTestCa
 
 
 
-    // ---------------------------------------------------------- Constructors
 
     public BigIntegerLocaleConverterTestCase(final String name) {
         super(name);
     }
 
-    // -------------------------------------------------- Overall Test Methods
 
     /**
      * Set up instance variables required by this test case.
@@ -67,7 +65,6 @@ public class BigIntegerLocaleConverterTestCase extends BaseLocaleConverterTestCa
      */
     public void testConstructorMain() {
 
-        // ------------- Construct with localized pattern ------------
         converter = new BigIntegerLocaleConverter(defaultValue,
                                                   localizedLocale,
                                                   localizedIntegerPattern,
@@ -108,7 +105,6 @@ public class BigIntegerLocaleConverterTestCase extends BaseLocaleConverterTestCa
         //convertValueToType(converter, "(B)", Double.class, localizedIntegerValue, localizedIntegerPattern, expectedValue);
 
 
-        // ------------- Construct with non-localized pattern ------------
         converter = new BigIntegerLocaleConverter(defaultValue,
                                                   localizedLocale,
                                                   defaultIntegerPattern,
@@ -130,7 +126,6 @@ public class BigIntegerLocaleConverterTestCase extends BaseLocaleConverterTestCa
      */
     public void testConstructor_2() {
 
-        // ------------- Construct using default locale ------------
         converter = new BigIntegerLocaleConverter();
 
         // Perform Tests
@@ -149,7 +144,6 @@ public class BigIntegerLocaleConverterTestCase extends BaseLocaleConverterTestCa
      */
     public void testConstructor_3() {
 
-        // ------------- Construct using localized pattern (default locale) --------
         converter = new BigIntegerLocaleConverter(true);
 
         // Perform Tests
@@ -166,7 +160,6 @@ public class BigIntegerLocaleConverterTestCase extends BaseLocaleConverterTestCa
      */
     public void testConstructor_4() {
 
-        // ------------- Construct using specified Locale --------
         converter = new BigIntegerLocaleConverter(localizedLocale);
 
         // Perform Tests
@@ -184,7 +177,6 @@ public class BigIntegerLocaleConverterTestCase extends BaseLocaleConverterTestCa
      */
     public void testConstructor_5() {
 
-        // ------------- Construct using specified Locale --------
         converter = new BigIntegerLocaleConverter(localizedLocale, true);
 
         // Perform Tests
@@ -201,7 +193,6 @@ public class BigIntegerLocaleConverterTestCase extends BaseLocaleConverterTestCa
      */
     public void testConstructor_6() {
 
-        // ------------- Construct using specified Locale --------
         converter = new BigIntegerLocaleConverter(localizedLocale, defaultIntegerPattern);
 
         // Perform Tests
@@ -217,7 +208,6 @@ public class BigIntegerLocaleConverterTestCase extends BaseLocaleConverterTestCa
      */
     public void testConstructor_7() {
 
-        // ------------- Construct using specified Locale --------
         converter = new BigIntegerLocaleConverter(localizedLocale, localizedIntegerPattern, true);
 
         // Perform Tests
@@ -233,7 +223,6 @@ public class BigIntegerLocaleConverterTestCase extends BaseLocaleConverterTestCa
      */
     public void testConstructor_8() {
 
-        // ------------- Construct using specified Locale --------
         converter = new BigIntegerLocaleConverter(defaultValue);
 
         // Perform Tests
@@ -249,7 +238,6 @@ public class BigIntegerLocaleConverterTestCase extends BaseLocaleConverterTestCa
      */
     public void testConstructor_9() {
 
-        // ------------- Construct using specified Locale --------
         converter = new BigIntegerLocaleConverter(defaultValue, true);
 
         // Perform Tests
diff --git a/src/test/java/org/apache/commons/beanutils/locale/converters/ByteLocaleConverterTestCase.java b/src/test/java/org/apache/commons/beanutils/locale/converters/ByteLocaleConverterTestCase.java
index 9abf52a8..87e251ea 100644
--- a/src/test/java/org/apache/commons/beanutils/locale/converters/ByteLocaleConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/locale/converters/ByteLocaleConverterTestCase.java
@@ -25,13 +25,11 @@ package org.apache.commons.beanutils.locale.converters;
 
 public class ByteLocaleConverterTestCase extends BaseLocaleConverterTestCase {
 
-    // ---------------------------------------------------------- Constructors
 
     public ByteLocaleConverterTestCase(final String name) {
         super(name);
     }
 
-    // -------------------------------------------------- Overall Test Methods
 
     /**
      * Set up instance variables required by this test case.
@@ -73,7 +71,6 @@ public class ByteLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructorMain() {
 
-        // ------------- Construct with localized pattern ------------
         converter = new ByteLocaleConverter(defaultValue,
                                                   localizedLocale,
                                                   localizedIntegerPattern,
@@ -112,7 +109,6 @@ public class ByteLocaleConverterTestCase extends BaseLocaleConverterTestCase {
         //convertValueToType(converter, "(B)", Double.class, localizedIntegerValue, localizedIntegerPattern, expectedValue);
 
 
-        // ------------- Construct with non-localized pattern ------------
         converter = new ByteLocaleConverter(defaultValue,
                                                   localizedLocale,
                                                   defaultIntegerPattern,
@@ -134,7 +130,6 @@ public class ByteLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructor_2() {
 
-        // ------------- Construct using default locale ------------
         converter = new ByteLocaleConverter();
 
         // Perform Tests
@@ -153,7 +148,6 @@ public class ByteLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructor_3() {
 
-        // ------------- Construct using localized pattern (default locale) --------
         converter = new ByteLocaleConverter(true);
 
         // Perform Tests
@@ -170,7 +164,6 @@ public class ByteLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructor_4() {
 
-        // ------------- Construct using specified Locale --------
         converter = new ByteLocaleConverter(localizedLocale);
 
         // Perform Tests
@@ -188,7 +181,6 @@ public class ByteLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructor_5() {
 
-        // ------------- Construct using specified Locale --------
         converter = new ByteLocaleConverter(localizedLocale, true);
 
         // Perform Tests
@@ -205,7 +197,6 @@ public class ByteLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructor_6() {
 
-        // ------------- Construct using specified Locale --------
         converter = new ByteLocaleConverter(localizedLocale, defaultIntegerPattern);
 
         // Perform Tests
@@ -221,7 +212,6 @@ public class ByteLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructor_7() {
 
-        // ------------- Construct using specified Locale --------
         converter = new ByteLocaleConverter(localizedLocale, localizedIntegerPattern, true);
 
         // Perform Tests
@@ -237,7 +227,6 @@ public class ByteLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructor_8() {
 
-        // ------------- Construct using specified Locale --------
         converter = new ByteLocaleConverter(defaultValue);
 
         // Perform Tests
@@ -253,7 +242,6 @@ public class ByteLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructor_9() {
 
-        // ------------- Construct using specified Locale --------
         converter = new ByteLocaleConverter(defaultValue, true);
 
         // Perform Tests
diff --git a/src/test/java/org/apache/commons/beanutils/locale/converters/DateLocaleConverterTestCase.java b/src/test/java/org/apache/commons/beanutils/locale/converters/DateLocaleConverterTestCase.java
index fa46c117..c271da6e 100644
--- a/src/test/java/org/apache/commons/beanutils/locale/converters/DateLocaleConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/locale/converters/DateLocaleConverterTestCase.java
@@ -51,7 +51,6 @@ public class DateLocaleConverterTestCase extends BaseLocaleConverterTestCase {
         super(name);
     }
 
-    // -------------------------------------------------- Overall Test Methods
 
     /**
      * Set up instance variables required by this test case.
@@ -213,7 +212,6 @@ public class DateLocaleConverterTestCase extends BaseLocaleConverterTestCase {
             return;
         }
 
-        // ------------- Construct with localized pattern ------------
         converter = new DateLocaleConverter(defaultValue,
                                             localizedLocale,
                                             localizedDatePattern,
@@ -242,7 +240,6 @@ public class DateLocaleConverterTestCase extends BaseLocaleConverterTestCase {
         //convertValueToType(converter, "(B)", String.class, localizedDateValue, localizedDatePattern, expectedValue);
 
 
-        // ------------- Construct with non-localized pattern ------------
         converter = new DateLocaleConverter(defaultValue,
                                             localizedLocale,
                                             defaultDatePattern,
@@ -264,7 +261,6 @@ public class DateLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructor_2() {
 
-        // ------------- Construct using default pattern & default locale ------------
         converter = new DateLocaleConverter();
 
         // Perform Tests
@@ -283,7 +279,6 @@ public class DateLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructor_3() {
 
-        // ------------- Construct using default pattern & default locale --------
         converter = new DateLocaleConverter(true);
 
         // Perform Tests
@@ -300,7 +295,6 @@ public class DateLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructor_4() {
 
-        // ------------- Construct using specified Locale --------
         converter = new DateLocaleConverter(localizedLocale);
 
         // Perform Tests
@@ -324,7 +318,6 @@ public class DateLocaleConverterTestCase extends BaseLocaleConverterTestCase {
             return;
         }
 
-        // ------------- Construct using specified Locale --------
         converter = new DateLocaleConverter(localizedLocale, true);
 
         // Perform Tests
@@ -341,7 +334,6 @@ public class DateLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructor_6() {
 
-        // ------------- Construct using specified Locale --------
         converter = new DateLocaleConverter(localizedLocale, defaultDatePattern);
 
         // Perform Tests
@@ -363,7 +355,6 @@ public class DateLocaleConverterTestCase extends BaseLocaleConverterTestCase {
             return;
         }
 
-        // ------------- Construct using specified Locale --------
         converter = new DateLocaleConverter(localizedLocale, localizedDatePattern, true);
 
         // Perform Tests
@@ -379,7 +370,6 @@ public class DateLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructor_8() {
 
-        // ------------- Construct using specified Locale --------
         converter = new DateLocaleConverter(defaultValue);
 
         // Perform Tests
@@ -395,7 +385,6 @@ public class DateLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructor_9() {
 
-        // ------------- Construct using specified Locale --------
         converter = new DateLocaleConverter(defaultValue, true);
 
         // Perform Tests
diff --git a/src/test/java/org/apache/commons/beanutils/locale/converters/DoubleLocaleConverterTestCase.java b/src/test/java/org/apache/commons/beanutils/locale/converters/DoubleLocaleConverterTestCase.java
index 6c2916bd..e86460fd 100644
--- a/src/test/java/org/apache/commons/beanutils/locale/converters/DoubleLocaleConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/locale/converters/DoubleLocaleConverterTestCase.java
@@ -27,13 +27,11 @@ public class DoubleLocaleConverterTestCase extends BaseLocaleConverterTestCase {
 
 
 
-    // ---------------------------------------------------------- Constructors
 
     public DoubleLocaleConverterTestCase(final String name) {
         super(name);
     }
 
-    // -------------------------------------------------- Overall Test Methods
 
     /**
      * Set up instance variables required by this test case.
@@ -64,7 +62,6 @@ public class DoubleLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructorMain() {
 
-        // ------------- Construct with localized pattern ------------
         converter = new DoubleLocaleConverter(defaultValue,
                                                   localizedLocale,
                                                   localizedDecimalPattern,
@@ -106,7 +103,6 @@ public class DoubleLocaleConverterTestCase extends BaseLocaleConverterTestCase {
         //convertValueToType(converter, "(B)", Integer.class, localizedDecimalValue, localizedDecimalPattern, expectedValue);
 
 
-        // ------------- Construct with non-localized pattern ------------
         converter = new DoubleLocaleConverter(defaultValue,
                                                   localizedLocale,
                                                   defaultDecimalPattern,
@@ -128,7 +124,6 @@ public class DoubleLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructor_2() {
 
-        // ------------- Construct using default locale ------------
         converter = new DoubleLocaleConverter();
 
         // Perform Tests
@@ -147,7 +142,6 @@ public class DoubleLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructor_3() {
 
-        // ------------- Construct using localized pattern (default locale) --------
         converter = new DoubleLocaleConverter(true);
 
         // Perform Tests
@@ -164,7 +158,6 @@ public class DoubleLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructor_4() {
 
-        // ------------- Construct using specified Locale --------
         converter = new DoubleLocaleConverter(localizedLocale);
 
         // Perform Tests
@@ -182,7 +175,6 @@ public class DoubleLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructor_5() {
 
-        // ------------- Construct using specified Locale --------
         converter = new DoubleLocaleConverter(localizedLocale, true);
 
         // Perform Tests
@@ -199,7 +191,6 @@ public class DoubleLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructor_6() {
 
-        // ------------- Construct using specified Locale --------
         converter = new DoubleLocaleConverter(localizedLocale, defaultDecimalPattern);
 
         // Perform Tests
@@ -215,7 +206,6 @@ public class DoubleLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructor_7() {
 
-        // ------------- Construct using specified Locale --------
         converter = new DoubleLocaleConverter(localizedLocale, localizedDecimalPattern, true);
 
         // Perform Tests
@@ -231,7 +221,6 @@ public class DoubleLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructor_8() {
 
-        // ------------- Construct using specified Locale --------
         converter = new DoubleLocaleConverter(defaultValue);
 
         // Perform Tests
@@ -247,7 +236,6 @@ public class DoubleLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructor_9() {
 
-        // ------------- Construct using specified Locale --------
         converter = new DoubleLocaleConverter(defaultValue, true);
 
         // Perform Tests
diff --git a/src/test/java/org/apache/commons/beanutils/locale/converters/FloatLocaleConverterTestCase.java b/src/test/java/org/apache/commons/beanutils/locale/converters/FloatLocaleConverterTestCase.java
index 62f90d10..17ac8615 100644
--- a/src/test/java/org/apache/commons/beanutils/locale/converters/FloatLocaleConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/locale/converters/FloatLocaleConverterTestCase.java
@@ -32,13 +32,11 @@ public class FloatLocaleConverterTestCase extends BaseLocaleConverterTestCase {
 
 
 
-    // ---------------------------------------------------------- Constructors
 
     public FloatLocaleConverterTestCase(final String name) {
         super(name);
     }
 
-    // -------------------------------------------------- Overall Test Methods
 
     /**
      * Set up instance variables required by this test case.
@@ -69,7 +67,6 @@ public class FloatLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructorMain() {
 
-        // ------------- Construct with localized pattern ------------
         converter = new FloatLocaleConverter(defaultValue,
                                                   localizedLocale,
                                                   localizedDecimalPattern,
@@ -111,7 +108,6 @@ public class FloatLocaleConverterTestCase extends BaseLocaleConverterTestCase {
         //convertValueToType(converter, "(B)", Integer.class, localizedDecimalValue, localizedDecimalPattern, expectedValue);
 
 
-        // ------------- Construct with non-localized pattern ------------
         converter = new FloatLocaleConverter(defaultValue,
                                                   localizedLocale,
                                                   defaultDecimalPattern,
@@ -133,7 +129,6 @@ public class FloatLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructor_2() {
 
-        // ------------- Construct using default locale ------------
         converter = new FloatLocaleConverter();
 
         // Perform Tests
@@ -152,7 +147,6 @@ public class FloatLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructor_3() {
 
-        // ------------- Construct using localized pattern (default locale) --------
         converter = new FloatLocaleConverter(true);
 
         // Perform Tests
@@ -169,7 +163,6 @@ public class FloatLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructor_4() {
 
-        // ------------- Construct using specified Locale --------
         converter = new FloatLocaleConverter(localizedLocale);
 
         // Perform Tests
@@ -187,7 +180,6 @@ public class FloatLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructor_5() {
 
-        // ------------- Construct using specified Locale --------
         converter = new FloatLocaleConverter(localizedLocale, true);
 
         // Perform Tests
@@ -204,7 +196,6 @@ public class FloatLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructor_6() {
 
-        // ------------- Construct using specified Locale --------
         converter = new FloatLocaleConverter(localizedLocale, defaultDecimalPattern);
 
         // Perform Tests
@@ -220,7 +211,6 @@ public class FloatLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructor_7() {
 
-        // ------------- Construct using specified Locale --------
         converter = new FloatLocaleConverter(localizedLocale, localizedDecimalPattern, true);
 
         // Perform Tests
@@ -236,7 +226,6 @@ public class FloatLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructor_8() {
 
-        // ------------- Construct using specified Locale --------
         converter = new FloatLocaleConverter(defaultValue);
 
         // Perform Tests
@@ -252,7 +241,6 @@ public class FloatLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructor_9() {
 
-        // ------------- Construct using specified Locale --------
         converter = new FloatLocaleConverter(defaultValue, true);
 
         // Perform Tests
diff --git a/src/test/java/org/apache/commons/beanutils/locale/converters/IntegerLocaleConverterTestCase.java b/src/test/java/org/apache/commons/beanutils/locale/converters/IntegerLocaleConverterTestCase.java
index 66da2321..ace9ab13 100644
--- a/src/test/java/org/apache/commons/beanutils/locale/converters/IntegerLocaleConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/locale/converters/IntegerLocaleConverterTestCase.java
@@ -27,13 +27,11 @@ public class IntegerLocaleConverterTestCase extends BaseLocaleConverterTestCase
 
 
 
-    // ---------------------------------------------------------- Constructors
 
     public IntegerLocaleConverterTestCase(final String name) {
         super(name);
     }
 
-    // -------------------------------------------------- Overall Test Methods
 
     /**
      * Set up instance variables required by this test case.
@@ -64,7 +62,6 @@ public class IntegerLocaleConverterTestCase extends BaseLocaleConverterTestCase
      */
     public void testConstructorMain() {
 
-        // ------------- Construct with localized pattern ------------
         converter = new IntegerLocaleConverter(defaultValue,
                                                   localizedLocale,
                                                   localizedIntegerPattern,
@@ -105,7 +102,6 @@ public class IntegerLocaleConverterTestCase extends BaseLocaleConverterTestCase
         //convertValueToType(converter, "(B)", Double.class, localizedIntegerValue, localizedIntegerPattern, expectedValue);
 
 
-        // ------------- Construct with non-localized pattern ------------
         converter = new IntegerLocaleConverter(defaultValue,
                                                   localizedLocale,
                                                   defaultIntegerPattern,
@@ -127,7 +123,6 @@ public class IntegerLocaleConverterTestCase extends BaseLocaleConverterTestCase
      */
     public void testConstructor_2() {
 
-        // ------------- Construct using default locale ------------
         converter = new IntegerLocaleConverter();
 
         // Perform Tests
@@ -146,7 +141,6 @@ public class IntegerLocaleConverterTestCase extends BaseLocaleConverterTestCase
      */
     public void testConstructor_3() {
 
-        // ------------- Construct using localized pattern (default locale) --------
         converter = new IntegerLocaleConverter(true);
 
         // Perform Tests
@@ -163,7 +157,6 @@ public class IntegerLocaleConverterTestCase extends BaseLocaleConverterTestCase
      */
     public void testConstructor_4() {
 
-        // ------------- Construct using specified Locale --------
         converter = new IntegerLocaleConverter(localizedLocale);
 
         // Perform Tests
@@ -181,7 +174,6 @@ public class IntegerLocaleConverterTestCase extends BaseLocaleConverterTestCase
      */
     public void testConstructor_5() {
 
-        // ------------- Construct using specified Locale --------
         converter = new IntegerLocaleConverter(localizedLocale, true);
 
         // Perform Tests
@@ -198,7 +190,6 @@ public class IntegerLocaleConverterTestCase extends BaseLocaleConverterTestCase
      */
     public void testConstructor_6() {
 
-        // ------------- Construct using specified Locale --------
         converter = new IntegerLocaleConverter(localizedLocale, defaultIntegerPattern);
 
         // Perform Tests
@@ -214,7 +205,6 @@ public class IntegerLocaleConverterTestCase extends BaseLocaleConverterTestCase
      */
     public void testConstructor_7() {
 
-        // ------------- Construct using specified Locale --------
         converter = new IntegerLocaleConverter(localizedLocale, localizedIntegerPattern, true);
 
         // Perform Tests
@@ -230,7 +220,6 @@ public class IntegerLocaleConverterTestCase extends BaseLocaleConverterTestCase
      */
     public void testConstructor_8() {
 
-        // ------------- Construct using specified Locale --------
         converter = new IntegerLocaleConverter(defaultValue);
 
         // Perform Tests
@@ -246,7 +235,6 @@ public class IntegerLocaleConverterTestCase extends BaseLocaleConverterTestCase
      */
     public void testConstructor_9() {
 
-        // ------------- Construct using specified Locale --------
         converter = new IntegerLocaleConverter(defaultValue, true);
 
         // Perform Tests
@@ -263,7 +251,6 @@ public class IntegerLocaleConverterTestCase extends BaseLocaleConverterTestCase
      */
     public void testNumber() {
 
-        // ------------- Construct using specified Locale --------
         converter = new IntegerLocaleConverter(localizedLocale);
 
         final Integer value = Integer.valueOf(1234);
diff --git a/src/test/java/org/apache/commons/beanutils/locale/converters/LongLocaleConverterTestCase.java b/src/test/java/org/apache/commons/beanutils/locale/converters/LongLocaleConverterTestCase.java
index 6ef871eb..380502a2 100644
--- a/src/test/java/org/apache/commons/beanutils/locale/converters/LongLocaleConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/locale/converters/LongLocaleConverterTestCase.java
@@ -27,13 +27,11 @@ public class LongLocaleConverterTestCase extends BaseLocaleConverterTestCase {
 
 
 
-    // ---------------------------------------------------------- Constructors
 
     public LongLocaleConverterTestCase(final String name) {
         super(name);
     }
 
-    // -------------------------------------------------- Overall Test Methods
 
     /**
      * Set up instance variables required by this test case.
@@ -64,7 +62,6 @@ public class LongLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructorMain() {
 
-        // ------------- Construct with localized pattern ------------
         converter = new LongLocaleConverter(defaultValue,
                                                   localizedLocale,
                                                   localizedIntegerPattern,
@@ -105,7 +102,6 @@ public class LongLocaleConverterTestCase extends BaseLocaleConverterTestCase {
         //convertValueToType(converter, "(B)", Double.class, localizedIntegerValue, localizedIntegerPattern, expectedValue);
 
 
-        // ------------- Construct with non-localized pattern ------------
         converter = new LongLocaleConverter(defaultValue,
                                                   localizedLocale,
                                                   defaultIntegerPattern,
@@ -127,7 +123,6 @@ public class LongLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructor_2() {
 
-        // ------------- Construct using default locale ------------
         converter = new LongLocaleConverter();
 
         // Perform Tests
@@ -146,7 +141,6 @@ public class LongLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructor_3() {
 
-        // ------------- Construct using localized pattern (default locale) --------
         converter = new LongLocaleConverter(true);
 
         // Perform Tests
@@ -163,7 +157,6 @@ public class LongLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructor_4() {
 
-        // ------------- Construct using specified Locale --------
         converter = new LongLocaleConverter(localizedLocale);
 
         // Perform Tests
@@ -181,7 +174,6 @@ public class LongLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructor_5() {
 
-        // ------------- Construct using specified Locale --------
         converter = new LongLocaleConverter(localizedLocale, true);
 
         // Perform Tests
@@ -198,7 +190,6 @@ public class LongLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructor_6() {
 
-        // ------------- Construct using specified Locale --------
         converter = new LongLocaleConverter(localizedLocale, defaultIntegerPattern);
 
         // Perform Tests
@@ -214,7 +205,6 @@ public class LongLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructor_7() {
 
-        // ------------- Construct using specified Locale --------
         converter = new LongLocaleConverter(localizedLocale, localizedIntegerPattern, true);
 
         // Perform Tests
@@ -230,7 +220,6 @@ public class LongLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructor_8() {
 
-        // ------------- Construct using specified Locale --------
         converter = new LongLocaleConverter(defaultValue);
 
         // Perform Tests
@@ -246,7 +235,6 @@ public class LongLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructor_9() {
 
-        // ------------- Construct using specified Locale --------
         converter = new LongLocaleConverter(defaultValue, true);
 
         // Perform Tests
diff --git a/src/test/java/org/apache/commons/beanutils/locale/converters/ShortLocaleConverterTestCase.java b/src/test/java/org/apache/commons/beanutils/locale/converters/ShortLocaleConverterTestCase.java
index 800507b9..b721ea4e 100644
--- a/src/test/java/org/apache/commons/beanutils/locale/converters/ShortLocaleConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/locale/converters/ShortLocaleConverterTestCase.java
@@ -27,13 +27,11 @@ public class ShortLocaleConverterTestCase extends BaseLocaleConverterTestCase {
 
 
 
-    // ---------------------------------------------------------- Constructors
 
     public ShortLocaleConverterTestCase(final String name) {
         super(name);
     }
 
-    // -------------------------------------------------- Overall Test Methods
 
     /**
      * Set up instance variables required by this test case.
@@ -64,7 +62,6 @@ public class ShortLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructorMain() {
 
-        // ------------- Construct with localized pattern ------------
         converter = new ShortLocaleConverter(defaultValue,
                                                   localizedLocale,
                                                   localizedIntegerPattern,
@@ -105,7 +102,6 @@ public class ShortLocaleConverterTestCase extends BaseLocaleConverterTestCase {
         //convertValueToType(converter, "(B)", Double.class, localizedIntegerValue, localizedIntegerPattern, expectedValue);
 
 
-        // ------------- Construct with non-localized pattern ------------
         converter = new ShortLocaleConverter(defaultValue,
                                                   localizedLocale,
                                                   defaultIntegerPattern,
@@ -127,7 +123,6 @@ public class ShortLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructor_2() {
 
-        // ------------- Construct using default locale ------------
         converter = new ShortLocaleConverter();
 
         // Perform Tests
@@ -146,7 +141,6 @@ public class ShortLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructor_3() {
 
-        // ------------- Construct using localized pattern (default locale) --------
         converter = new ShortLocaleConverter(true);
 
         // Perform Tests
@@ -163,7 +157,6 @@ public class ShortLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructor_4() {
 
-        // ------------- Construct using specified Locale --------
         converter = new ShortLocaleConverter(localizedLocale);
 
         // Perform Tests
@@ -181,7 +174,6 @@ public class ShortLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructor_5() {
 
-        // ------------- Construct using specified Locale --------
         converter = new ShortLocaleConverter(localizedLocale, true);
 
         // Perform Tests
@@ -198,7 +190,6 @@ public class ShortLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructor_6() {
 
-        // ------------- Construct using specified Locale --------
         converter = new ShortLocaleConverter(localizedLocale, defaultIntegerPattern);
 
         // Perform Tests
@@ -214,7 +205,6 @@ public class ShortLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructor_7() {
 
-        // ------------- Construct using specified Locale --------
         converter = new ShortLocaleConverter(localizedLocale, localizedIntegerPattern, true);
 
         // Perform Tests
@@ -230,7 +220,6 @@ public class ShortLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructor_8() {
 
-        // ------------- Construct using specified Locale --------
         converter = new ShortLocaleConverter(defaultValue);
 
         // Perform Tests
@@ -246,7 +235,6 @@ public class ShortLocaleConverterTestCase extends BaseLocaleConverterTestCase {
      */
     public void testConstructor_9() {
 
-        // ------------- Construct using specified Locale --------
         converter = new ShortLocaleConverter(defaultValue, true);
 
         // Perform Tests
diff --git a/src/test/java/org/apache/commons/beanutils/priv/PackageBean.java b/src/test/java/org/apache/commons/beanutils/priv/PackageBean.java
index 51d23fea..18bef612 100644
--- a/src/test/java/org/apache/commons/beanutils/priv/PackageBean.java
+++ b/src/test/java/org/apache/commons/beanutils/priv/PackageBean.java
@@ -32,7 +32,6 @@ package org.apache.commons.beanutils.priv;
 class PackageBean {
 
 
-    // ----------------------------------------------------------- Constructors
 
 
     /**
@@ -44,7 +43,6 @@ class PackageBean {
     }
 
 
-    // ------------------------------------------------------------- Properties
 
 
     /**
diff --git a/src/test/java/org/apache/commons/beanutils/priv/PrivateBean.java b/src/test/java/org/apache/commons/beanutils/priv/PrivateBean.java
index d0b281bc..d5c7f578 100644
--- a/src/test/java/org/apache/commons/beanutils/priv/PrivateBean.java
+++ b/src/test/java/org/apache/commons/beanutils/priv/PrivateBean.java
@@ -33,7 +33,6 @@ package org.apache.commons.beanutils.priv;
 class PrivateBean implements PrivateDirect {
 
 
-    // ----------------------------------------------------------- Constructors
 
 
     /**
@@ -45,7 +44,6 @@ class PrivateBean implements PrivateDirect {
     }
 
 
-    // ------------------------------------------------------------- Properties
 
 
     /**
diff --git a/src/test/java/org/apache/commons/beanutils/priv/PrivateBeanSubclass.java b/src/test/java/org/apache/commons/beanutils/priv/PrivateBeanSubclass.java
index a1ef5afa..ce16287b 100644
--- a/src/test/java/org/apache/commons/beanutils/priv/PrivateBeanSubclass.java
+++ b/src/test/java/org/apache/commons/beanutils/priv/PrivateBeanSubclass.java
@@ -28,7 +28,6 @@ package org.apache.commons.beanutils.priv;
 class PrivateBeanSubclass extends PrivateBean {
 
 
-    // ----------------------------------------------------------- Constructors
 
 
     /**
@@ -39,7 +38,6 @@ class PrivateBeanSubclass extends PrivateBean {
     }
 
 
-    // ------------------------------------------------------------- Properties
 
 
     /**
diff --git a/src/test/java/org/apache/commons/beanutils/priv/PrivateDirect.java b/src/test/java/org/apache/commons/beanutils/priv/PrivateDirect.java
index d3d0fd23..349aec94 100644
--- a/src/test/java/org/apache/commons/beanutils/priv/PrivateDirect.java
+++ b/src/test/java/org/apache/commons/beanutils/priv/PrivateDirect.java
@@ -27,7 +27,6 @@ package org.apache.commons.beanutils.priv;
 public interface PrivateDirect extends PrivateIndirect {
 
 
-    // ------------------------------------------------------------- Properties
 
 
     /**
diff --git a/src/test/java/org/apache/commons/beanutils/priv/PrivateIndirect.java b/src/test/java/org/apache/commons/beanutils/priv/PrivateIndirect.java
index 52e5d4e6..92319818 100644
--- a/src/test/java/org/apache/commons/beanutils/priv/PrivateIndirect.java
+++ b/src/test/java/org/apache/commons/beanutils/priv/PrivateIndirect.java
@@ -27,7 +27,6 @@ package org.apache.commons.beanutils.priv;
 public interface PrivateIndirect {
 
 
-    // ------------------------------------------------------------- Properties
 
 
     /**
diff --git a/src/test/java/org/apache/commons/beanutils/priv/PublicSubBean.java b/src/test/java/org/apache/commons/beanutils/priv/PublicSubBean.java
index 8345cbe3..a3fe2275 100644
--- a/src/test/java/org/apache/commons/beanutils/priv/PublicSubBean.java
+++ b/src/test/java/org/apache/commons/beanutils/priv/PublicSubBean.java
@@ -32,7 +32,6 @@ package org.apache.commons.beanutils.priv;
 public class PublicSubBean extends PackageBean {
 
 
-    // ----------------------------------------------------------- Constructors
 
 
     /**
@@ -44,7 +43,6 @@ public class PublicSubBean extends PackageBean {
     }
 
 
-    // ------------------------------------------------------------- Properties
 
 
     /**