diff --git a/src/main/java/org/apache/commons/cli/AmbiguousOptionException.java b/src/main/java/org/apache/commons/cli/AmbiguousOptionException.java
index 1a64e95c1..fcf8b3c34 100644
--- a/src/main/java/org/apache/commons/cli/AmbiguousOptionException.java
+++ b/src/main/java/org/apache/commons/cli/AmbiguousOptionException.java
@@ -35,9 +35,9 @@ public class AmbiguousOptionException extends UnrecognizedOptionException {
     /**
      * Build the exception message from the specified list of options.
      *
-     * @param option
-     * @param matchingOptions
-     * @return
+     * @param option          The ambiguous option.
+     * @param matchingOptions The list of matching options.
+     * @return The exception message.
      */
     private static String createMessage(final String option, final Collection<String> matchingOptions) {
         final StringBuilder buf = new StringBuilder("Ambiguous option: '");
diff --git a/src/main/java/org/apache/commons/cli/PatternOptionBuilder.java b/src/main/java/org/apache/commons/cli/PatternOptionBuilder.java
index f31bf21a9..969f35c7c 100644
--- a/src/main/java/org/apache/commons/cli/PatternOptionBuilder.java
+++ b/src/main/java/org/apache/commons/cli/PatternOptionBuilder.java
@@ -84,7 +84,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * </p>
  *
  * <p>
- * ODO Extract these types into OptionType and make them pluggable.</p>
+ * TODO Extract these types into OptionType and make them pluggable.</p>
  */
 public class PatternOptionBuilder {