diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/Style.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/Style.java
index aa24d5865..3fdff5a7c 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/Style.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/Style.java
@@ -47,11 +47,9 @@ public class Style {
 
     /**
      * Get versioned url of Mapbox streets style.
-     * <p>
      * <ul>
      * <li>Current default version is 9.</li>
-     * </ul
-     * </p>
+     * </ul>
      * <p>
      * More information on the Mapbox styles API can be found on https://www.mapbox.com/api-documentation/#styles
      * </p>
@@ -65,11 +63,9 @@ public class Style {
 
     /**
      * Get versioned url of Outdoors streets style.
-     * <p>
      * <ul>
      * <li>Current version is 9.</li>
      * </ul>
-     * </p>
      * <p>
      * More information on the Mapbox styles API can be found on https://www.mapbox.com/api-documentation/#styles
      * </p>
@@ -83,11 +79,9 @@ public class Style {
 
     /**
      * Get versioned url of Light style.
-     * <p>
      * <ul>
      * <li>Current default version is 9.</li>
      * </ul>
-     * </p>
      * <p>
      * More information on the Mapbox styles API can be found on https://www.mapbox.com/api-documentation/#styles
      * </p>
@@ -101,11 +95,9 @@ public class Style {
 
     /**
      * Get versioned url of Dark style.
-     * <p>
      * <ul>
      * <li>Current default version is 9.</li>
      * </ul>
-     * </p>
      * <p>
      * More information on the Mapbox styles API can be found on https://www.mapbox.com/api-documentation/#styles
      * </p>
@@ -119,11 +111,9 @@ public class Style {
 
     /**
      * Get versioned url of Satellite style.
-     * <p>
      * <ul>
      * <li>Current version is 9.</li>
      * </ul>
-     * </p>
      * <p>
      * More information on the Mapbox styles API can be found on https://www.mapbox.com/api-documentation/#styles
      * </p>
@@ -137,11 +127,9 @@ public class Style {
 
     /**
      * Get versioned url of Satellite streets style.
-     * <p>
      * <ul>
      * <li>Current version is 9.</li>
      * </ul>
-     * </p>
      * <p>
      * More information on the Mapbox styles API can be found on https://www.mapbox.com/api-documentation/#styles
      * </p>
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationServices.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationServices.java
index e45f3cc71..2f1be900e 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationServices.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationServices.java
@@ -18,12 +18,10 @@ import java.util.concurrent.CopyOnWriteArrayList;
 
 /**
  * Manages locational updates. Contains methods to register and unregister location listeners.
- * <p>
  * <ul>
  * <li>You can register a {@link LocationListener} with {@link #addLocationListener(LocationListener)} to receive location updates.</li>
  * <li> You can unregister a {@link LocationListener} with {@link #removeLocationListener(LocationListener)}.</li>
  * </ul>
- * <p/>
  * <p>
  * Note: If registering a listener in your Activity.onResume() implementation, you should unregister it in Activity.onPause().
  * (You won't receive location updates when paused, and this will cut down on unnecessary system overhead).
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
index 403f58153..36ecece61 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
@@ -874,7 +874,7 @@ public class MapView extends FrameLayout {
      * <p>
      * DEPRECATED @see MapboxAccountManager#getAccessToken()
      * </p>
-     * <p/>
+     * <p>
      * Returns the current Mapbox access token used to load map styles and tiles.
      * </p>
      *
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
index 62cb74979..19cd2aebc 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
@@ -291,7 +291,7 @@ public class MapboxMap {
      * it will return the current location of the camera in flight.
      *
      * @param update The change that should be applied to the camera.
-     * @see {@link CameraUpdateFactory} for a set of updates.
+     * @see com.mapbox.mapboxsdk.camera.CameraUpdateFactory for a set of updates.
      */
     @UiThread
     public final void easeCamera(CameraUpdate update) {
@@ -306,7 +306,7 @@ public class MapboxMap {
      * @param update     The change that should be applied to the camera.
      * @param durationMs The duration of the animation in milliseconds. This must be strictly
      *                   positive, otherwise an IllegalArgumentException will be thrown.
-     * @see {@link CameraUpdateFactory} for a set of updates.
+     * @see com.mapbox.mapboxsdk.camera.CameraUpdateFactory for a set of updates.
      */
     @UiThread
     public final void easeCamera(CameraUpdate update, int durationMs) {
@@ -327,7 +327,7 @@ public class MapboxMap {
      *                   will be notified with onFinish(). If the animation stops due to interruption
      *                   by a later camera movement or a user gesture, onCancel() will be called.
      *                   Do not update or ease the camera from within onCancel().
-     * @see {@link CameraUpdateFactory} for a set of camera updates.
+     * @see com.mapbox.mapboxsdk.camera.CameraUpdateFactory for a set of updates.
      */
     @UiThread
     public final void easeCamera(CameraUpdate update, int durationMs, final MapboxMap.CancelableCallback callback) {
@@ -368,7 +368,7 @@ public class MapboxMap {
      * of the camera in flight.
      *
      * @param update The change that should be applied to the camera.
-     * @see {@link CameraUpdateFactory} for a set of updates.
+     * @see com.mapbox.mapboxsdk.camera.CameraUpdateFactory for a set of updates.
      */
     @UiThread
     public final void animateCamera(CameraUpdate update) {
@@ -385,7 +385,7 @@ public class MapboxMap {
      * @param callback The callback to invoke from the main thread when the animation stops. If the
      *                 animation completes normally, onFinish() is called; otherwise, onCancel() is
      *                 called. Do not update or animate the camera from within onCancel().
-     * @see {@link CameraUpdateFactory} for a set of updates.
+     * @see com.mapbox.mapboxsdk.camera.CameraUpdateFactory for a set of updates.
      */
     @UiThread
     public final void animateCamera(CameraUpdate update, MapboxMap.CancelableCallback callback) {
@@ -401,7 +401,7 @@ public class MapboxMap {
      * @param update     The change that should be applied to the camera.
      * @param durationMs The duration of the animation in milliseconds. This must be strictly
      *                   positive, otherwise an IllegalArgumentException will be thrown.
-     * @see {@link CameraUpdateFactory} for a set of updates.
+     * @see com.mapbox.mapboxsdk.camera.CameraUpdateFactory for a set of updates.
      */
     @UiThread
     public final void animateCamera(CameraUpdate update, int durationMs) {
@@ -424,7 +424,7 @@ public class MapboxMap {
      *                   by a later camera movement or a user gesture, onCancel() will be called.
      *                   Do not update or animate the camera from within onCancel(). If a callback
      *                   isn't required, leave it as null.
-     * @see {@link CameraUpdateFactory} for a set of updates.
+     * @see com.mapbox.mapboxsdk.camera.CameraUpdateFactory for a set of updates.
      */
     @UiThread
     public final void animateCamera(CameraUpdate update, int durationMs, final MapboxMap.CancelableCallback callback) {
@@ -1282,9 +1282,11 @@ public class MapboxMap {
     //
 
     /**
+     * <p>
      * Sets the distance from the edges of the map view’s frame to the edges of the map
      * view’s logical viewport.
-     * <p/>
+     * </p>
+     * <p>
      * When the value of this property is equal to {0,0,0,0}, viewport
      * properties such as `centerCoordinate` assume a viewport that matches the map
      * view’s frame. Otherwise, those properties are inset, excluding part of the