diff --git a/google-http-client/src/main/java/com/google/api/client/http/AbstractInputStreamContent.java b/google-http-client/src/main/java/com/google/api/client/http/AbstractInputStreamContent.java
index 789fab5ec..96ed50193 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/AbstractInputStreamContent.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/AbstractInputStreamContent.java
@@ -29,8 +29,6 @@
  * amount of content read from the input stream, you may use {@link ByteStreams#limit(InputStream,
  * long)}.
  *
- * <p>
- *
  * <p>Implementations don't need to be thread-safe.
  *
  * @since 1.4
diff --git a/google-http-client/src/main/java/com/google/api/client/http/ExponentialBackOffPolicy.java b/google-http-client/src/main/java/com/google/api/client/http/ExponentialBackOffPolicy.java
index 2384c8a89..20d8859bf 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/ExponentialBackOffPolicy.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/ExponentialBackOffPolicy.java
@@ -31,7 +31,7 @@
  *     retry_interval * (random value in range [1 - randomization_factor, 1 + randomization_factor])
  * </pre>
  *
- * In other words {@link #getNextBackOffMillis()} will range between the randomization factor
+ * <p>In other words {@link #getNextBackOffMillis()} will range between the randomization factor
  * percentage below and above the retry interval. For example, using 2 seconds as the base retry
  * interval and 0.5 as the randomization factor, the actual back off period used in the next retry
  * attempt will be between 1 and 3 seconds.
diff --git a/google-http-client/src/main/java/com/google/api/client/json/JsonParser.java b/google-http-client/src/main/java/com/google/api/client/json/JsonParser.java
index 9bb1184f0..7ac07ff56 100644
--- a/google-http-client/src/main/java/com/google/api/client/json/JsonParser.java
+++ b/google-http-client/src/main/java/com/google/api/client/json/JsonParser.java
@@ -50,8 +50,6 @@
  * <p>Implementation has no fields and therefore thread-safe, but sub-classes are not necessarily
  * thread-safe.
  *
- * <p>
- *
  * <p>If a JSON map is encountered while using a destination class of type Map, then an {@link
  * java.util.ArrayMap} is used by default for the parsed values.
  *
diff --git a/google-http-client/src/main/java/com/google/api/client/json/JsonString.java b/google-http-client/src/main/java/com/google/api/client/json/JsonString.java
index 6b93bbe21..68b3b2f9c 100644
--- a/google-http-client/src/main/java/com/google/api/client/json/JsonString.java
+++ b/google-http-client/src/main/java/com/google/api/client/json/JsonString.java
@@ -32,7 +32,7 @@
  * </code>
  * </pre>
  *
- * can be used for this JSON content:
+ * <p>can be used for this JSON content:
  *
  * <pre>
  * <code>
@@ -40,7 +40,7 @@
  * </code>
  * </pre>
  *
- * However, if instead the JSON content uses a JSON String to store the value, one needs to use the
+ * <p>However, if instead the JSON content uses a JSON String to store the value, one needs to use the
  * {@link JsonString} annotation. For example:
  *
  * <pre>
@@ -51,7 +51,7 @@
  * </code>
  * </pre>
  *
- * can be used for this JSON content:
+ * <p>can be used for this JSON content:
  *
  * <pre>
  * <code>
diff --git a/google-http-client/src/main/java/com/google/api/client/testing/json/webtoken/TestCertificates.java b/google-http-client/src/main/java/com/google/api/client/testing/json/webtoken/TestCertificates.java
index 5c3457af6..2ae6b08cc 100644
--- a/google-http-client/src/main/java/com/google/api/client/testing/json/webtoken/TestCertificates.java
+++ b/google-http-client/src/main/java/com/google/api/client/testing/json/webtoken/TestCertificates.java
@@ -240,7 +240,7 @@ public X509TrustManager getTrustManager() throws IOException, GeneralSecurityExc
    * {"foo":"bar"}
    * </pre>
    *
-   * The message is signed using {@code FOO_BAR_COM_KEY}.
+   * <p>The message is signed using {@code FOO_BAR_COM_KEY}.
    */
   public static final String JWS_SIGNATURE =
       "eyJhbGciOiJSUzI1NiIsIng1YyI6WyJNSUlDNlRDQ0FkRUNBU293RFFZSktvWklo"
diff --git a/google-http-client/src/main/java/com/google/api/client/util/PemReader.java b/google-http-client/src/main/java/com/google/api/client/util/PemReader.java
index a1f06a3bc..607d80de0 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/PemReader.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/PemReader.java
@@ -36,9 +36,7 @@
  *
  * <p>Limitations:
  *
- * <p>
- *
- * <ul>
+ * <p><ul>
  *   <li>Assumes the PEM file section content is not encrypted and cannot handle the case of any
  *       headers inside the BEGIN and END tag.
  *   <li>It also ignores any attributes associated with any PEM file section.