diff --git a/src/main/java/org/apache/commons/collections4/BidiMap.java b/src/main/java/org/apache/commons/collections4/BidiMap.java
index 5f04ae6ba..0135c6f9a 100644
--- a/src/main/java/org/apache/commons/collections4/BidiMap.java
+++ b/src/main/java/org/apache/commons/collections4/BidiMap.java
@@ -40,7 +40,6 @@ import java.util.Set;
  *
  * @param <K> the type of the keys in the map
  * @param <V> the type of the values in the map
- *
  * @since 3.0
  */
 public interface BidiMap<K, V> extends IterableMap<K, V> {
@@ -57,7 +56,6 @@ public interface BidiMap<K, V> extends IterableMap<K, V> {
      *
      * @param value  the value to find the key for
      * @return the mapped key, or {@code null} if not found
-     *
      * @throws ClassCastException (optional) if the map limits the type of the
      *  value and the specified value is inappropriate
      * @throws NullPointerException (optional) if the map limits the values to
@@ -101,7 +99,6 @@ public interface BidiMap<K, V> extends IterableMap<K, V> {
      * @param key  the key to store
      * @param value  the value to store
      * @return the previous value mapped to this key
-     *
      * @throws UnsupportedOperationException if the {@code put} method is not supported
      * @throws ClassCastException (optional) if the map limits the type of the
      *  value and the specified value is inappropriate
@@ -126,7 +123,6 @@ public interface BidiMap<K, V> extends IterableMap<K, V> {
      *
      * @param value  the value to find the key-value pair for
      * @return the key that was removed, {@code null} if nothing removed
-     *
      * @throws ClassCastException (optional) if the map limits the type of the
      *  value and the specified value is inappropriate
      * @throws NullPointerException (optional) if the map limits the values to
diff --git a/src/main/java/org/apache/commons/collections4/BoundedCollection.java b/src/main/java/org/apache/commons/collections4/BoundedCollection.java
index d07fbd991..6ab5f2916 100644
--- a/src/main/java/org/apache/commons/collections4/BoundedCollection.java
+++ b/src/main/java/org/apache/commons/collections4/BoundedCollection.java
@@ -28,7 +28,6 @@ import java.util.Collection;
  *
  * @see CollectionUtils#isFull
  * @see CollectionUtils#maxSize
- *
  * @param <E> the type of elements in this collection
  * @since 3.0
  */
diff --git a/src/main/java/org/apache/commons/collections4/ClosureUtils.java b/src/main/java/org/apache/commons/collections4/ClosureUtils.java
index 0d541f13e..f56529730 100644
--- a/src/main/java/org/apache/commons/collections4/ClosureUtils.java
+++ b/src/main/java/org/apache/commons/collections4/ClosureUtils.java
@@ -66,7 +66,6 @@ public class ClosureUtils {
      * The transformer's result will be ignored.
      *
      * @see org.apache.commons.collections4.functors.TransformerClosure
-     *
      * @param <E>  the type that the closure acts on
      * @param transformer  the transformer to run each time in the closure, null means nop
      * @return the closure
@@ -80,7 +79,6 @@ public class ClosureUtils {
      * result into the next closure.
      *
      * @see org.apache.commons.collections4.functors.ChainedClosure
-     *
      * @param <E>  the type that the closure acts on
      * @param closures  an array of closures to chain
      * @return the {@code chained} closure
@@ -97,7 +95,6 @@ public class ClosureUtils {
      * method on the collection.
      *
      * @see org.apache.commons.collections4.functors.ChainedClosure
-     *
      * @param <E>  the type that the closure acts on
      * @param closures  a collection of closures to chain
      * @return the {@code chained} closure
@@ -113,7 +110,6 @@ public class ClosureUtils {
      * until the predicate returns false.
      *
      * @see org.apache.commons.collections4.functors.WhileClosure
-     *
      * @param <E>  the type that the closure acts on
      * @param closure  the closure to call repeatedly, not null
      * @param predicate  the predicate to use as an end of loop test, not null
@@ -143,7 +139,6 @@ public class ClosureUtils {
      * A null closure or zero count returns the {@code NOPClosure}.
      *
      * @see org.apache.commons.collections4.functors.ForClosure
-     *
      * @param <E>  the type that the closure acts on
      * @param count  the number of times to loop
      * @param closure  the closure to call repeatedly
@@ -158,7 +153,6 @@ public class ClosureUtils {
      * result of the specified predicate.
      *
      * @see org.apache.commons.collections4.functors.IfClosure
-     *
      * @param <E>  the type that the closure acts on
      * @param predicate  the validating predicate
      * @param trueClosure  the closure called if the predicate is true
@@ -176,7 +170,6 @@ public class ClosureUtils {
      * on the specified predicate.
      *
      * @see org.apache.commons.collections4.functors.IfClosure
-     *
      * @param <E>  the type that the closure acts on
      * @param predicate  the predicate to switch on
      * @param trueClosure  the closure called if the predicate is true
@@ -196,7 +189,6 @@ public class ClosureUtils {
      *
      * @see org.apache.commons.collections4.functors.InvokerTransformer
      * @see org.apache.commons.collections4.functors.TransformerClosure
-     *
      * @param <E>  the type that the closure acts on
      * @param methodName  the name of the method
      * @return the {@code invoker} closure
@@ -213,7 +205,6 @@ public class ClosureUtils {
      *
      * @see org.apache.commons.collections4.functors.InvokerTransformer
      * @see org.apache.commons.collections4.functors.TransformerClosure
-     *
      * @param <E>  the type that the closure acts on
      * @param methodName  the name of the method
      * @param paramTypes  the parameter types
@@ -233,7 +224,6 @@ public class ClosureUtils {
      * This could be useful during testing as a placeholder.
      *
      * @see org.apache.commons.collections4.functors.NOPClosure
-     *
      * @param <E>  the type that the closure acts on
      * @return the closure
      */
@@ -254,7 +244,6 @@ public class ClosureUtils {
      * </p>
      *
      * @see org.apache.commons.collections4.functors.SwitchClosure
-     *
      * @param <E>  the type that the closure acts on
      * @param predicatesAndClosures  a map of predicates to closures
      * @return the {@code switch} closure
@@ -276,7 +265,6 @@ public class ClosureUtils {
      * </p>
      *
      * @see org.apache.commons.collections4.functors.SwitchClosure
-     *
      * @param <E>  the type that the closure acts on
      * @param predicates  an array of predicates to check, not null
      * @param closures  an array of closures to call, not null
@@ -301,7 +289,6 @@ public class ClosureUtils {
      * </p>
      *
      * @see org.apache.commons.collections4.functors.SwitchClosure
-     *
      * @param <E>  the type that the closure acts on
      * @param predicates  an array of predicates to check, not null
      * @param closures  an array of closures to call, not null
@@ -328,7 +315,6 @@ public class ClosureUtils {
      * </p>
      *
      * @see org.apache.commons.collections4.functors.SwitchClosure
-     *
      * @param <E>  the type that the closure acts on
      * @param objectsAndClosures  a map of objects to closures
      * @return the closure
@@ -356,7 +342,6 @@ public class ClosureUtils {
      * predicate returns false.
      *
      * @see org.apache.commons.collections4.functors.WhileClosure
-     *
      * @param <E>  the type that the closure acts on
      * @param predicate  the predicate to use as an end of loop test, not null
      * @param closure  the closure to call repeatedly, not null
diff --git a/src/main/java/org/apache/commons/collections4/CollectionUtils.java b/src/main/java/org/apache/commons/collections4/CollectionUtils.java
index 469b1b922..136c183cd 100644
--- a/src/main/java/org/apache/commons/collections4/CollectionUtils.java
+++ b/src/main/java/org/apache/commons/collections4/CollectionUtils.java
@@ -1412,7 +1412,6 @@ public class CollectionUtils {
      * </p>
      *
      * @see PermutationIterator
-     *
      * @param <E>  the element type
      * @param collection  the collection to create permutations for, must not be null
      * @return an unordered collection of all permutations of the input collection
diff --git a/src/main/java/org/apache/commons/collections4/FactoryUtils.java b/src/main/java/org/apache/commons/collections4/FactoryUtils.java
index 06f3187f2..61b520740 100644
--- a/src/main/java/org/apache/commons/collections4/FactoryUtils.java
+++ b/src/main/java/org/apache/commons/collections4/FactoryUtils.java
@@ -51,7 +51,6 @@ public class FactoryUtils {
      * use the prototype factory.
      *
      * @see org.apache.commons.collections4.functors.ConstantFactory
-     *
      * @param <T> the type that the factory creates
      * @param constantToReturn  the constant object to return each time in the factory
      * @return the {@code constant} factory.
@@ -65,7 +64,6 @@ public class FactoryUtils {
      * This could be useful during testing as a placeholder.
      *
      * @see org.apache.commons.collections4.functors.ExceptionFactory
-     *
      * @param <T> the type that the factory creates
      * @return the factory
      */
@@ -78,7 +76,6 @@ public class FactoryUtils {
      * a no-args constructor.
      *
      * @see org.apache.commons.collections4.functors.InstantiateFactory
-     *
      * @param <T> the type that the factory creates
      * @param classToInstantiate  the Class to instantiate each time in the factory
      * @return the {@code reflection} factory
@@ -93,7 +90,6 @@ public class FactoryUtils {
      * the arguments specified to this method.
      *
      * @see org.apache.commons.collections4.functors.InstantiateFactory
-     *
      * @param <T> the type that the factory creates
      * @param classToInstantiate  the Class to instantiate each time in the factory
      * @param paramTypes  parameter types for the constructor, can be null
@@ -132,7 +128,6 @@ public class FactoryUtils {
      * </ul>
      *
      * @see org.apache.commons.collections4.functors.PrototypeFactory
-     *
      * @param <T> the type that the factory creates
      * @param prototype  the object to clone each time in the factory
      * @return the {@code prototype} factory, or a {@link ConstantFactory#NULL_INSTANCE} if
diff --git a/src/main/java/org/apache/commons/collections4/Get.java b/src/main/java/org/apache/commons/collections4/Get.java
index 782ebf1d0..24394d89d 100644
--- a/src/main/java/org/apache/commons/collections4/Get.java
+++ b/src/main/java/org/apache/commons/collections4/Get.java
@@ -24,7 +24,6 @@ import java.util.Set;
  *
  * @param <K> the type of the keys in this map
  * @param <V> the type of the values in this map
- *
  * @since 4.0
  * @see Put
  */
diff --git a/src/main/java/org/apache/commons/collections4/IterableGet.java b/src/main/java/org/apache/commons/collections4/IterableGet.java
index 4189821bf..f78c85fe7 100644
--- a/src/main/java/org/apache/commons/collections4/IterableGet.java
+++ b/src/main/java/org/apache/commons/collections4/IterableGet.java
@@ -21,7 +21,6 @@ package org.apache.commons.collections4;
  *
  * @param <K> the type of the keys in this map
  * @param <V> the type of the values in this map
- *
  * @since 4.0
  * @see Put
  */
diff --git a/src/main/java/org/apache/commons/collections4/IterableMap.java b/src/main/java/org/apache/commons/collections4/IterableMap.java
index 35afecec3..1cf3d5fb7 100644
--- a/src/main/java/org/apache/commons/collections4/IterableMap.java
+++ b/src/main/java/org/apache/commons/collections4/IterableMap.java
@@ -36,7 +36,6 @@ import java.util.Map;
  *
  * @param <K> the type of the keys in this map
  * @param <V> the type of the values in this map
- *
  * @since 3.0
  */
 public interface IterableMap<K, V> extends Map<K, V>, Put<K, V>, IterableGet<K, V> {
diff --git a/src/main/java/org/apache/commons/collections4/IterableSortedMap.java b/src/main/java/org/apache/commons/collections4/IterableSortedMap.java
index 5970a162d..350b943aa 100644
--- a/src/main/java/org/apache/commons/collections4/IterableSortedMap.java
+++ b/src/main/java/org/apache/commons/collections4/IterableSortedMap.java
@@ -23,7 +23,6 @@ import java.util.SortedMap;
  *
  * @param <K> the type of the keys in the map
  * @param <V> the type of the values in the map
- *
  * @since 4.0
  */
 public interface IterableSortedMap<K, V> extends SortedMap<K, V>, OrderedMap<K, V> {
diff --git a/src/main/java/org/apache/commons/collections4/ListUtils.java b/src/main/java/org/apache/commons/collections4/ListUtils.java
index d8d6f32cf..d22609f4f 100644
--- a/src/main/java/org/apache/commons/collections4/ListUtils.java
+++ b/src/main/java/org/apache/commons/collections4/ListUtils.java
@@ -606,7 +606,6 @@ public class ListUtils {
      * @param predicate  the predicate to use, may be null
      * @return the elements matching the predicate (new list)
      * @throws NullPointerException if the input list is null
-     *
      * @since 4.0
      * @see CollectionUtils#select(Iterable, Predicate)
      */
@@ -627,7 +626,6 @@ public class ListUtils {
      * @param predicate the predicate to use, may be null
      * @return the elements <strong>not</strong> matching the predicate (new list)
      * @throws NullPointerException if the input collection is null
-     *
      * @since 4.0
      * @see CollectionUtils#selectRejected(Iterable, Predicate)
      */
diff --git a/src/main/java/org/apache/commons/collections4/MultiMap.java b/src/main/java/org/apache/commons/collections4/MultiMap.java
index ad6d4fa10..bb46f89d6 100644
--- a/src/main/java/org/apache/commons/collections4/MultiMap.java
+++ b/src/main/java/org/apache/commons/collections4/MultiMap.java
@@ -45,7 +45,6 @@ import java.util.Collection;
  *
  * @param <K> the type of the keys in this map
  * @param <V> the type of the values in this map
- *
  * @since 2.0
  * @deprecated since 4.1, use {@link MultiValuedMap} instead
  */
diff --git a/src/main/java/org/apache/commons/collections4/OrderedBidiMap.java b/src/main/java/org/apache/commons/collections4/OrderedBidiMap.java
index 14f4a9ee8..207f266c5 100644
--- a/src/main/java/org/apache/commons/collections4/OrderedBidiMap.java
+++ b/src/main/java/org/apache/commons/collections4/OrderedBidiMap.java
@@ -26,7 +26,6 @@ package org.apache.commons.collections4;
  *
  * @param <K> the type of the keys in the map
  * @param <V> the type of the values in the map
- *
  * @since 3.0
  */
 public interface OrderedBidiMap<K, V> extends BidiMap<K, V>, OrderedMap<K, V> {
diff --git a/src/main/java/org/apache/commons/collections4/OrderedMap.java b/src/main/java/org/apache/commons/collections4/OrderedMap.java
index 770789440..23c4a29db 100644
--- a/src/main/java/org/apache/commons/collections4/OrderedMap.java
+++ b/src/main/java/org/apache/commons/collections4/OrderedMap.java
@@ -22,7 +22,6 @@ package org.apache.commons.collections4;
  *
  * @param <K> the type of the keys in the map
  * @param <V> the type of the values in the map
- *
  * @since 3.0
  */
 public interface OrderedMap<K, V> extends IterableMap<K, V> {
diff --git a/src/main/java/org/apache/commons/collections4/Put.java b/src/main/java/org/apache/commons/collections4/Put.java
index a69fc2d94..529bba9bf 100644
--- a/src/main/java/org/apache/commons/collections4/Put.java
+++ b/src/main/java/org/apache/commons/collections4/Put.java
@@ -30,7 +30,6 @@ import java.util.Map;
  *
  * @param <K> the type of the keys in this map
  * @param <V> the type of the values in this map
- *
  * @since 4.0
  * @see Get
  */
diff --git a/src/main/java/org/apache/commons/collections4/SplitMapUtils.java b/src/main/java/org/apache/commons/collections4/SplitMapUtils.java
index d01bea533..318d490ad 100644
--- a/src/main/java/org/apache/commons/collections4/SplitMapUtils.java
+++ b/src/main/java/org/apache/commons/collections4/SplitMapUtils.java
@@ -32,7 +32,6 @@ import org.apache.commons.collections4.set.UnmodifiableSet;
  * and/or {@link Get} but not {@link Map}.
  *
  * @since 4.0
- *
  * @see Get
  * @see Put
  */
diff --git a/src/main/java/org/apache/commons/collections4/Transformer.java b/src/main/java/org/apache/commons/collections4/Transformer.java
index fada2391e..864152b10 100644
--- a/src/main/java/org/apache/commons/collections4/Transformer.java
+++ b/src/main/java/org/apache/commons/collections4/Transformer.java
@@ -35,7 +35,6 @@ import java.util.function.Function;
  *
  * @param <T> the type of the input to the function.
  * @param <R> the type of the result of the function.
- *
  * @since 1.0
  * @deprecated Use {@link Function}.
  */
diff --git a/src/main/java/org/apache/commons/collections4/TrieUtils.java b/src/main/java/org/apache/commons/collections4/TrieUtils.java
index e1c49db66..dac6e4361 100644
--- a/src/main/java/org/apache/commons/collections4/TrieUtils.java
+++ b/src/main/java/org/apache/commons/collections4/TrieUtils.java
@@ -33,7 +33,6 @@ public class TrieUtils {
      * @param trie  the trie to make unmodifiable, must not be null
      * @return an unmodifiable trie backed by the given trie
      * @throws NullPointerException if trie is null
-     *
      * @see java.util.Collections#unmodifiableMap(java.util.Map)
      */
     public static <K, V> Trie<K, V> unmodifiableTrie(final Trie<K, ? extends V> trie) {
diff --git a/src/main/java/org/apache/commons/collections4/bag/AbstractMapBag.java b/src/main/java/org/apache/commons/collections4/bag/AbstractMapBag.java
index 4835ab079..d5528ffe1 100644
--- a/src/main/java/org/apache/commons/collections4/bag/AbstractMapBag.java
+++ b/src/main/java/org/apache/commons/collections4/bag/AbstractMapBag.java
@@ -478,7 +478,6 @@ public abstract class AbstractMapBag<E> implements Bag<E> {
      * Remove any members of the bag that are not in the given bag, respecting
      * cardinality.
      * @see #retainAll(Collection)
-     *
      * @param other the bag to retain
      * @return {@code true} if this call changed the collection
      */
diff --git a/src/main/java/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java b/src/main/java/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java
index 1ee268a3a..2351dcc5d 100644
--- a/src/main/java/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java
+++ b/src/main/java/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java
@@ -39,7 +39,6 @@ import org.apache.commons.collections4.keyvalue.AbstractMapEntryDecorator;
  *
  * @param <K> the type of the keys in the map
  * @param <V> the type of the values in the map
- *
  * @see DualHashBidiMap
  * @see DualTreeBidiMap
  * @since 3.0
diff --git a/src/main/java/org/apache/commons/collections4/bidimap/DualHashBidiMap.java b/src/main/java/org/apache/commons/collections4/bidimap/DualHashBidiMap.java
index 0978077da..afd721797 100644
--- a/src/main/java/org/apache/commons/collections4/bidimap/DualHashBidiMap.java
+++ b/src/main/java/org/apache/commons/collections4/bidimap/DualHashBidiMap.java
@@ -40,7 +40,6 @@ import org.apache.commons.collections4.BidiMap;
  *
  * @param <K> the type of the keys in the map
  * @param <V> the type of the values in the map
- *
  * @since 3.0
  */
 public class DualHashBidiMap<K, V> extends AbstractDualBidiMap<K, V> implements Serializable {
diff --git a/src/main/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMap.java b/src/main/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMap.java
index 1eb6eb769..34790f1bb 100644
--- a/src/main/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMap.java
+++ b/src/main/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMap.java
@@ -34,7 +34,6 @@ import org.apache.commons.collections4.BidiMap;
  *
  * @param <K> the type of the keys in the map
  * @param <V> the type of the values in the map
- *
  * @since 4.0
  */
 public class DualLinkedHashBidiMap<K, V> extends AbstractDualBidiMap<K, V> implements Serializable {
diff --git a/src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java b/src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java
index 6ca759404..7482c5a97 100644
--- a/src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java
+++ b/src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java
@@ -80,7 +80,6 @@ import org.apache.commons.collections4.keyvalue.UnmodifiableMapEntry;
  *
  * @param <K> the type of the keys in this map
  * @param <V> the type of the values in this map
- *
  * @since 3.0 (previously DoubleOrderedMap v2.0)
  */
 public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>>
@@ -871,7 +870,6 @@ public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>>
      * Checks a key for validity (non-null and implements Comparable)
      *
      * @param key the key to be checked
-     *
      * @throws NullPointerException if key is null
      * @throws ClassCastException if key is not Comparable
      */
@@ -885,7 +883,6 @@ public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>>
      *
      * @param key the key to be checked
      * @param value the value to be checked
-     *
      * @throws NullPointerException if key or value is null
      * @throws ClassCastException if key or value is not Comparable
      */
@@ -916,7 +913,6 @@ public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>>
      * Checks a value for validity (non-null and implements Comparable)
      *
      * @param value the value to be checked
-     *
      * @throws NullPointerException if value is null
      * @throws ClassCastException if value is not Comparable
      */
@@ -929,7 +925,6 @@ public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>>
      *
      * @param o1  the first object
      * @param o2  the second object
-     *
      * @return negative value if o1 &lt; o2; 0 if o1 == o2; positive
      *         value if o1 &gt; o2
      */
@@ -1653,7 +1648,6 @@ public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>>
      * Inserts a node by its value.
      *
      * @param newNode the node to be inserted
-     *
      * @throws IllegalArgumentException if the node already exists
      *                                     in the value mapping
      */
diff --git a/src/main/java/org/apache/commons/collections4/collection/IndexedCollection.java b/src/main/java/org/apache/commons/collections4/collection/IndexedCollection.java
index dec686f5f..17084b2b6 100644
--- a/src/main/java/org/apache/commons/collections4/collection/IndexedCollection.java
+++ b/src/main/java/org/apache/commons/collections4/collection/IndexedCollection.java
@@ -42,7 +42,6 @@ import org.apache.commons.collections4.map.MultiValueMap;
  *
  * @param <K> the type of object in the index.
  * @param <C> the type of object in the collection.
- *
  * @since 4.0
  */
 public class IndexedCollection<K, C> extends AbstractCollectionDecorator<C> {
diff --git a/src/main/java/org/apache/commons/collections4/comparators/BooleanComparator.java b/src/main/java/org/apache/commons/collections4/comparators/BooleanComparator.java
index 749456d44..2f9518ad0 100644
--- a/src/main/java/org/apache/commons/collections4/comparators/BooleanComparator.java
+++ b/src/main/java/org/apache/commons/collections4/comparators/BooleanComparator.java
@@ -26,7 +26,6 @@ import java.util.Comparator;
  * @see #getTrueFirstComparator()
  * @see #getFalseFirstComparator()
  * @see #booleanComparator(boolean)
- *
  * @since 3.0
  */
 public final class BooleanComparator implements Comparator<Boolean>, Serializable {
diff --git a/src/main/java/org/apache/commons/collections4/comparators/ComparableComparator.java b/src/main/java/org/apache/commons/collections4/comparators/ComparableComparator.java
index 2e0a109cc..82e64a191 100644
--- a/src/main/java/org/apache/commons/collections4/comparators/ComparableComparator.java
+++ b/src/main/java/org/apache/commons/collections4/comparators/ComparableComparator.java
@@ -38,7 +38,6 @@ import java.util.Comparator;
  * </p>
  *
  * @param <E> the type of objects compared by this comparator
- *
  * @since 2.0
  * @see java.util.Collections#reverseOrder()
  */
diff --git a/src/main/java/org/apache/commons/collections4/comparators/ReverseComparator.java b/src/main/java/org/apache/commons/collections4/comparators/ReverseComparator.java
index e7d1be680..bdbf297dd 100644
--- a/src/main/java/org/apache/commons/collections4/comparators/ReverseComparator.java
+++ b/src/main/java/org/apache/commons/collections4/comparators/ReverseComparator.java
@@ -26,7 +26,6 @@ import org.apache.commons.collections4.ComparatorUtils;
  * to its {@link #compare(Object, Object) compare} method.
  *
  * @param <E> the type of objects compared by this comparator
- *
  * @since 2.0
  * @see java.util.Collections#reverseOrder()
  */
diff --git a/src/main/java/org/apache/commons/collections4/comparators/TransformingComparator.java b/src/main/java/org/apache/commons/collections4/comparators/TransformingComparator.java
index 989334022..217aa3a59 100644
--- a/src/main/java/org/apache/commons/collections4/comparators/TransformingComparator.java
+++ b/src/main/java/org/apache/commons/collections4/comparators/TransformingComparator.java
@@ -33,9 +33,7 @@ import org.apache.commons.collections4.Transformer;
  *
  * @param <I> the type of the input to the function
  * @param <O> the type of the result of the function
- *
  * @since 2.1
- *
  * @see org.apache.commons.collections4.Transformer
  * @see org.apache.commons.collections4.comparators.ComparableComparator
  */
diff --git a/src/main/java/org/apache/commons/collections4/functors/ComparatorPredicate.java b/src/main/java/org/apache/commons/collections4/functors/ComparatorPredicate.java
index 93e8998bb..b399d8296 100644
--- a/src/main/java/org/apache/commons/collections4/functors/ComparatorPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/ComparatorPredicate.java
@@ -177,7 +177,6 @@ public class ComparatorPredicate<T> extends AbstractPredicate<T> implements Seri
      *
      * @see org.apache.commons.collections4.Predicate#test(Object)
      * @see java.util.Comparator#compare(Object first, Object second)
-     *
      * @param target  the target object to compare to
      * @return {@code true} if the comparison succeeds according to the selected criterion
      * @throws IllegalStateException if the criterion is invalid (really not possible)
diff --git a/src/main/java/org/apache/commons/collections4/iterators/AbstractUntypedIteratorDecorator.java b/src/main/java/org/apache/commons/collections4/iterators/AbstractUntypedIteratorDecorator.java
index 59e817a84..a360a229b 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/AbstractUntypedIteratorDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/AbstractUntypedIteratorDecorator.java
@@ -27,7 +27,6 @@ import java.util.Objects;
  *
  * @param <I> the type of the iterator being decorated.
  * @param <O> the type of elements returned by this iterator.
- *
  * @since 4.0
  */
 public abstract class AbstractUntypedIteratorDecorator<I, O> implements Iterator<O> {
diff --git a/src/main/java/org/apache/commons/collections4/iterators/ArrayListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/ArrayListIterator.java
index a4293ddbf..1e409e37f 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/ArrayListIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/ArrayListIterator.java
@@ -37,7 +37,6 @@ import org.apache.commons.collections4.ResettableListIterator;
  * @see org.apache.commons.collections4.iterators.ArrayIterator
  * @see java.util.Iterator
  * @see java.util.ListIterator
- *
  * @since 3.0
  */
 public class ArrayListIterator<E> extends ArrayIterator<E>
diff --git a/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java
index 2ca332cab..5c4820468 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java
@@ -35,7 +35,6 @@ import org.apache.commons.collections4.ResettableListIterator;
  * @see org.apache.commons.collections4.iterators.ObjectArrayIterator
  * @see java.util.Iterator
  * @see java.util.ListIterator
- *
  * @since 3.0
  */
 public class ObjectArrayListIterator<E> extends ObjectArrayIterator<E>
diff --git a/src/main/java/org/apache/commons/collections4/iterators/PermutationIterator.java b/src/main/java/org/apache/commons/collections4/iterators/PermutationIterator.java
index ef1f9b286..0deaad290 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/PermutationIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/PermutationIterator.java
@@ -40,7 +40,6 @@ import java.util.Objects;
  * </p>
  *
  * @param <E>  the type of the objects being permuted
- *
  * @since 4.0
  */
 public class PermutationIterator<E> implements Iterator<List<E>> {
diff --git a/src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java b/src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java
index 02894f4c3..5b32ad3f1 100644
--- a/src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java
@@ -85,7 +85,6 @@ import org.apache.commons.collections4.keyvalue.DefaultMapEntry;
  *
  * @param <K> the type of the keys in this map
  * @param <V> the type of the values in this map
- *
  * @see java.lang.ref.Reference
  * @since 3.1 (extracted from ReferenceMap in 3.0)
  */
diff --git a/src/main/java/org/apache/commons/collections4/map/CompositeMap.java b/src/main/java/org/apache/commons/collections4/map/CompositeMap.java
index d6ee47cf4..115ab7a02 100644
--- a/src/main/java/org/apache/commons/collections4/map/CompositeMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/CompositeMap.java
@@ -86,7 +86,6 @@ public class CompositeMap<K, V> extends AbstractIterableMap<K, V> implements Ser
          * @param map  the CompositeMap which is being modified
          * @param composited  array of Maps in the CompositeMap being modified
          * @param mapToAdd  Mappings to be stored in this CompositeMap
-         *
          * @throws UnsupportedOperationException if not defined
          * @throws ClassCastException if the class of the specified key or value
          *            prevents it from being stored in this map.
@@ -442,7 +441,6 @@ public class CompositeMap<K, V> extends AbstractIterableMap<K, V> implements Ser
      * specified map is modified while the operation is in progress.
      *
      * @param map Mappings to be stored in this map.
-     *
      * @throws UnsupportedOperationException if the {@code putAll} method is
      *         not supported by this map.
      *
diff --git a/src/main/java/org/apache/commons/collections4/map/DefaultedMap.java b/src/main/java/org/apache/commons/collections4/map/DefaultedMap.java
index 5870b4c78..d1d99d8be 100644
--- a/src/main/java/org/apache/commons/collections4/map/DefaultedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/DefaultedMap.java
@@ -65,7 +65,6 @@ import org.apache.commons.collections4.functors.FactoryTransformer;
  *
  * @param <K> the type of the keys in this map
  * @param <V> the type of the values in this map
- *
  * @since 3.2
  * @see LazyMap
  */
diff --git a/src/main/java/org/apache/commons/collections4/map/EntrySetToMapIteratorAdapter.java b/src/main/java/org/apache/commons/collections4/map/EntrySetToMapIteratorAdapter.java
index d67d3e481..f2e1f564b 100644
--- a/src/main/java/org/apache/commons/collections4/map/EntrySetToMapIteratorAdapter.java
+++ b/src/main/java/org/apache/commons/collections4/map/EntrySetToMapIteratorAdapter.java
@@ -28,7 +28,6 @@ import org.apache.commons.collections4.ResettableIterator;
  *
  * @param <K> the type of the keys in the map
  * @param <V> the type of the values in the map
- *
  * @since 4.0
  */
 public class EntrySetToMapIteratorAdapter<K, V> implements MapIterator<K, V>, ResettableIterator<K> {
diff --git a/src/main/java/org/apache/commons/collections4/map/ReferenceIdentityMap.java b/src/main/java/org/apache/commons/collections4/map/ReferenceIdentityMap.java
index ba63eb3ce..06768063d 100644
--- a/src/main/java/org/apache/commons/collections4/map/ReferenceIdentityMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/ReferenceIdentityMap.java
@@ -72,7 +72,6 @@ import java.lang.ref.Reference;
  *
  * @param <K> the type of the keys in this map
  * @param <V> the type of the values in this map
- *
  * @see java.lang.ref.Reference
  * @since 3.0 (previously in main package v2.1)
  */
diff --git a/src/main/java/org/apache/commons/collections4/map/ReferenceMap.java b/src/main/java/org/apache/commons/collections4/map/ReferenceMap.java
index 2e9b8b611..6eb651a94 100644
--- a/src/main/java/org/apache/commons/collections4/map/ReferenceMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/ReferenceMap.java
@@ -75,7 +75,6 @@ import java.io.Serializable;
  *
  * @param <K> the type of the keys in the map
  * @param <V> the type of the values in the map
- *
  * @see java.lang.ref.Reference
  * @since 3.0 (previously in main package v2.1)
  */
diff --git a/src/main/java/org/apache/commons/collections4/map/TransformedMap.java b/src/main/java/org/apache/commons/collections4/map/TransformedMap.java
index 87e3974a6..10d85b0c7 100644
--- a/src/main/java/org/apache/commons/collections4/map/TransformedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/TransformedMap.java
@@ -45,7 +45,6 @@ import org.apache.commons.collections4.Transformer;
  *
  * @param <K> the type of the keys in this map
  * @param <V> the type of the values in this map
- *
  * @see org.apache.commons.collections4.splitmap.TransformedSplitMap
  * @since 3.0
  */
diff --git a/src/main/java/org/apache/commons/collections4/map/UnmodifiableEntrySet.java b/src/main/java/org/apache/commons/collections4/map/UnmodifiableEntrySet.java
index 9a4674c82..add5a4612 100644
--- a/src/main/java/org/apache/commons/collections4/map/UnmodifiableEntrySet.java
+++ b/src/main/java/org/apache/commons/collections4/map/UnmodifiableEntrySet.java
@@ -36,7 +36,6 @@ import org.apache.commons.collections4.set.AbstractSetDecorator;
  *
  * @param <K> the type of the keys in the map
  * @param <V> the type of the values in the map
- *
  * @since 3.0
  */
 public final class UnmodifiableEntrySet<K, V>
diff --git a/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapDecorator.java b/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapDecorator.java
index fcb682db9..61cd3a87e 100644
--- a/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapDecorator.java
@@ -37,7 +37,6 @@ import org.apache.commons.collections4.MultiValuedMap;
  *
  * @param <K> the type of key elements
  * @param <V> the type of value elements
- *
  * @since 4.1
  */
 public abstract class AbstractMultiValuedMapDecorator<K, V>
diff --git a/src/main/java/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMap.java b/src/main/java/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMap.java
index 537beea17..c4981d201 100644
--- a/src/main/java/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMap.java
+++ b/src/main/java/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMap.java
@@ -39,7 +39,6 @@ import org.apache.commons.collections4.set.UnmodifiableSet;
  *
  * @param <K> the type of key elements
  * @param <V> the type of value elements
- *
  * @since 4.1
  */
 public final class UnmodifiableMultiValuedMap<K, V>
diff --git a/src/main/java/org/apache/commons/collections4/splitmap/TransformedSplitMap.java b/src/main/java/org/apache/commons/collections4/splitmap/TransformedSplitMap.java
index 597792d4f..bf0708e2f 100644
--- a/src/main/java/org/apache/commons/collections4/splitmap/TransformedSplitMap.java
+++ b/src/main/java/org/apache/commons/collections4/splitmap/TransformedSplitMap.java
@@ -62,7 +62,6 @@ import org.apache.commons.collections4.map.LinkedMap;
  * @param <U> the type of the values to put in this map
  * @param <V> the type of the values to get in this map
  * @since 4.0
- *
  * @see org.apache.commons.collections4.SplitMapUtils#readableMap(org.apache.commons.collections4.Get)
  * @see org.apache.commons.collections4.SplitMapUtils#writableMap(Put)
  */
diff --git a/src/main/java/org/apache/commons/collections4/trie/PatriciaTrie.java b/src/main/java/org/apache/commons/collections4/trie/PatriciaTrie.java
index 07e74e4f5..1df1c1489 100644
--- a/src/main/java/org/apache/commons/collections4/trie/PatriciaTrie.java
+++ b/src/main/java/org/apache/commons/collections4/trie/PatriciaTrie.java
@@ -56,7 +56,6 @@ import org.apache.commons.collections4.trie.analyzer.StringKeyAnalyzer;
  * </p>
  *
  * @param <V> the type of the values in this map
- *
  * @see <a href="https://en.wikipedia.org/wiki/Radix_tree">Radix Tree</a>
  * @see <a href="https://users.monash.edu/~lloyd/tildeAlgDS/Tree/PATRICIA/">PATRICIA</a>
  * @see <a href="https://www.imperialviolet.org/binary/critbit.pdf">Crit-Bit Tree</a>
diff --git a/src/test/java/org/apache/commons/collections4/functors/AbstractCompositePredicateTest.java b/src/test/java/org/apache/commons/collections4/functors/AbstractCompositePredicateTest.java
index 23a03e727..8e3b0ded9 100644
--- a/src/test/java/org/apache/commons/collections4/functors/AbstractCompositePredicateTest.java
+++ b/src/test/java/org/apache/commons/collections4/functors/AbstractCompositePredicateTest.java
@@ -61,7 +61,6 @@ public abstract class AbstractCompositePredicateTest<T> extends AbstractMockPred
      * Creates an instance of the predicate to test.
      *
      * @param predicates the argument to {@code getInstance}.
-     *
      * @return a predicate to test.
      */
     protected abstract Predicate<T> getPredicateInstance(Collection<Predicate<T>> predicates);
@@ -70,7 +69,6 @@ public abstract class AbstractCompositePredicateTest<T> extends AbstractMockPred
      * Creates an instance of the predicate to test.
      *
      * @param predicates the arguments to {@code getInstance}.
-     *
      * @return a predicate to test.
      */
     protected abstract Predicate<T> getPredicateInstance(Predicate<? super T>... predicates);
diff --git a/src/test/java/org/apache/commons/collections4/functors/AbstractMockPredicateTest.java b/src/test/java/org/apache/commons/collections4/functors/AbstractMockPredicateTest.java
index 46535b9fa..5362950ee 100644
--- a/src/test/java/org/apache/commons/collections4/functors/AbstractMockPredicateTest.java
+++ b/src/test/java/org/apache/commons/collections4/functors/AbstractMockPredicateTest.java
@@ -55,7 +55,6 @@ public abstract class AbstractMockPredicateTest<T> {
      * Creates a single mock predicate.
      *
      * @param returnValue the return value for the mock predicate, or null if the mock is not expected to be called.
-     *
      * @return a single mock predicate.
      */
     @SuppressWarnings({"boxing"})