diff --git a/src/main/java/org/apache/commons/math4/ml/clustering/DBSCANClusterer.java b/src/main/java/org/apache/commons/math4/ml/clustering/DBSCANClusterer.java
index 19436fc8d..e065eeb2c 100644
--- a/src/main/java/org/apache/commons/math4/ml/clustering/DBSCANClusterer.java
+++ b/src/main/java/org/apache/commons/math4/ml/clustering/DBSCANClusterer.java
@@ -25,7 +25,6 @@ import java.util.Map;
 import java.util.Set;
 
 import org.apache.commons.math4.exception.NotPositiveException;
-import org.apache.commons.math4.exception.NullArgumentException;
 import org.apache.commons.math4.ml.distance.DistanceMeasure;
 import org.apache.commons.math4.ml.distance.EuclideanDistance;
 import org.apache.commons.math4.util.MathUtils;
@@ -124,9 +123,8 @@ public class DBSCANClusterer<T extends Clusterable> extends Clusterer<T> {
     /**
      * Performs DBSCAN cluster analysis.
      *
-     * @param points the points to cluster
-     * @return the list of clusters
-     * @throws NullArgumentException if the data points are null
+     * @param points Points to cluster (cannot be {@code null}).
+     * @return the list of clusters.
      */
     @Override
     public List<Cluster<T>> cluster(final Collection<T> points) {
diff --git a/src/main/java/org/apache/commons/math4/ml/clustering/FuzzyKMeansClusterer.java b/src/main/java/org/apache/commons/math4/ml/clustering/FuzzyKMeansClusterer.java
index 7a7668ad2..cee9da4dc 100644
--- a/src/main/java/org/apache/commons/math4/ml/clustering/FuzzyKMeansClusterer.java
+++ b/src/main/java/org/apache/commons/math4/ml/clustering/FuzzyKMeansClusterer.java
@@ -21,7 +21,6 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.commons.math4.exception.MathIllegalArgumentException;
 import org.apache.commons.math4.exception.MathIllegalStateException;
 import org.apache.commons.math4.exception.NumberIsTooSmallException;
 import org.apache.commons.math4.linear.MatrixUtils;
@@ -258,8 +257,9 @@ public class FuzzyKMeansClusterer<T extends Clusterable> extends Clusterer<T> {
      *
      * @param dataPoints the points to cluster
      * @return the list of clusters
-     * @throws MathIllegalArgumentException if the data points are null or the number
-     *     of clusters is larger than the number of data points
+     * @throws org.apache.commons.math4.exception.MathIllegalArgumentException if
+     * the data points are null or the number of clusters is larger than the number
+     * of data points
      */
     @Override
     public List<CentroidCluster<T>> cluster(final Collection<T> dataPoints) {
diff --git a/src/main/java/org/apache/commons/math4/ml/clustering/MultiKMeansPlusPlusClusterer.java b/src/main/java/org/apache/commons/math4/ml/clustering/MultiKMeansPlusPlusClusterer.java
index e74093648..2170797e6 100644
--- a/src/main/java/org/apache/commons/math4/ml/clustering/MultiKMeansPlusPlusClusterer.java
+++ b/src/main/java/org/apache/commons/math4/ml/clustering/MultiKMeansPlusPlusClusterer.java
@@ -20,8 +20,6 @@ package org.apache.commons.math4.ml.clustering;
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.commons.math4.exception.ConvergenceException;
-import org.apache.commons.math4.exception.MathIllegalArgumentException;
 import org.apache.commons.math4.ml.clustering.evaluation.SumOfClusterVariances;
 
 /**
@@ -72,11 +70,12 @@ public class MultiKMeansPlusPlusClusterer<T extends Clusterable> extends Cluster
      *
      * @param points the points to cluster
      * @return a list of clusters containing the points
-     * @throws MathIllegalArgumentException if the data points are null or the number
-     *   of clusters is larger than the number of data points
-     * @throws ConvergenceException if an empty cluster is encountered and the
-     *   underlying {@link KMeansPlusPlusClusterer} has its
-     *   {@link KMeansPlusPlusClusterer.EmptyClusterStrategy} is set to {@code ERROR}.
+     * @throws org.apache.commons.math4.exception.MathIllegalArgumentException if
+     * the data points are null or the number of clusters is larger than the
+     * number of data points
+     * @throws org.apache.commons.math4.exception.ConvergenceException if
+     * an empty cluster is encountered and the underlying {@link KMeansPlusPlusClusterer}
+     * has its {@link KMeansPlusPlusClusterer.EmptyClusterStrategy} is set to {@code ERROR}.
      */
     @Override
     public List<CentroidCluster<T>> cluster(final Collection<T> points) {