diff --git a/build.gradle b/build.gradle
index 4cbf456df..c87f437ea 100644
--- a/build.gradle
+++ b/build.gradle
@@ -128,19 +128,12 @@ tasks.withType(JacocoReport) {
 jacocoTestReport.dependsOn test
 
 checkstyle {
-    toolVersion = '7.0'
+    toolVersion = '8.7'
+    configFile = file("$projectDir/google-style.xml")
     showViolations = true
-}
-
-dependencies {
-    checkstyle( 'com.puppycrawl.tools:checkstyle:7.0' )
-}
-
-tasks.withType(Checkstyle) {
     ignoreFailures = false
-    configFile = file("$projectDir/google-style.xml")
-    exclude '**/org/openqa/selenium/**'
 }
+checkstyleMain.excludes = ['**/org/openqa/selenium/**']
 
 task javadocJar(type: Jar) {
     classifier = 'javadoc'
diff --git a/google-style.xml b/google-style.xml
index 06e2c452c..2cfbd65b6 100755
--- a/google-style.xml
+++ b/google-style.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module PUBLIC
-          "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
-          "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+        "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+        "http://checkstyle.sourceforge.net/dtds/configuration_1_3.dtd">
 
 <!-- Originally designed by:-->
 <!--
@@ -46,8 +46,8 @@
             <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
         </module>
         <module name="AvoidStarImport">
-			<property name="severity" value="warning"/>
-		</module>
+            <property name="severity" value="warning"/>
+        </module>
         <module name="OneTopLevelClass"/>
         <module name="NoLineWrap"/>
         <module name="EmptyBlock">
@@ -55,10 +55,7 @@
             <property name="tokens" value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
         </module>
         <module name="NeedBraces"/>
-        <module name="LeftCurly">
-            <property name="maxLineLength" value="100"/>
-        </module>
-        <module name="RightCurly"/>
+        <module name="LeftCurly" />
         <module name="RightCurly">
             <property name="option" value="alone"/>
             <property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO, STATIC_INIT, INSTANCE_INIT"/>
@@ -97,7 +94,7 @@
              value="Package name ''{0}'' must match pattern ''{1}''."/>
         </module>
         <module name="TypeName">
-			<property name="format" value="^([*iOSFindBy*]||[*iOSXCUITFind*])||([A-Z][a-zA-Z0-9])*$"/>
+            <property name="format" value="^([*iOSFindBy*]||[*iOSXCUITFind*])||([A-Z][a-zA-Z0-9])*$"/>
             <message key="name.invalidPattern"
              value="Type name ''{0}'' must match pattern ''{1}''."/>
         </module>
@@ -166,7 +163,7 @@
             <property name="specialImportsRegExp" value="com.google"/>
             <property name="sortImportsInGroupAlphabetically" value="true"/>
             <property name="customImportOrderRules" value="STATIC###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE###STANDARD_JAVA_PACKAGE"/>
-			<property name="severity" value="warning"/>
+            <property name="severity" value="warning"/>
         </module>
         <module name="MethodParamPad"/>
         <module name="OperatorWrap">
@@ -182,19 +179,19 @@
         </module>
         <module name="NonEmptyAtclauseDescription"/>
         <module name="JavadocTagContinuationIndentation">
-			<property name="severity" value="warning"/>
-		</module>
+            <property name="severity" value="warning"/>
+        </module>
         <module name="SummaryJavadoc">
             <property name="forbiddenSummaryFragments" value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
-			<property name="severity" value="warning"/>
+            <property name="severity" value="warning"/>
         </module>
         <module name="JavadocParagraph">
-			<property name="severity" value="warning"/>
-		</module>
+            <property name="severity" value="warning"/>
+        </module>
         <module name="AtclauseOrder">
             <property name="tagOrder" value="@param, @return, @throws, @deprecated"/>
             <property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
-			<property name="severity" value="warning"/>
+            <property name="severity" value="warning"/>
         </module>
         <module name="JavadocMethod">
             <property name="scope" value="public"/>
@@ -215,8 +212,8 @@
         </module>
         <module name="EmptyCatchBlock">
             <property name="exceptionVariableName" value="expected"/>
-			
+
         </module>
         <module name="CommentsIndentation"/>
     </module>
-</module>
\ No newline at end of file
+</module>
diff --git a/src/main/java/io/appium/java_client/AppiumDriver.java b/src/main/java/io/appium/java_client/AppiumDriver.java
index dc7df8727..439ccbe2f 100644
--- a/src/main/java/io/appium/java_client/AppiumDriver.java
+++ b/src/main/java/io/appium/java_client/AppiumDriver.java
@@ -53,14 +53,14 @@
 import java.util.Set;
 
 /**
-* @param <T> the required type of class which implement {@link org.openqa.selenium.WebElement}.
+ * Default Appium driver implementation.
+ *
+ * @param <T> the required type of class which implement {@link WebElement}.
  *          Instances of the defined type will be returned via findElement* and findElements*
  *          Warning (!!!). Allowed types:
- *          {@link org.openqa.selenium.WebElement}
- *          {@link org.openqa.selenium.remote.RemoteWebElement}
- *          {@link io.appium.java_client.MobileElement} and its subclasses that designed
- *          specifically
- *          for each target mobile OS (still Android and iOS)
+ *          {@link WebElement}, {@link org.openqa.selenium.remote.RemoteWebElement},
+ *          {@link MobileElement} and its subclasses that designed
+ *          specifically for each target mobile OS (still Android and iOS)
 */
 @SuppressWarnings("unchecked")
 public class AppiumDriver<T extends WebElement>
@@ -73,11 +73,12 @@ public class AppiumDriver<T extends WebElement>
     private ExecuteMethod executeMethod;
 
     /**
-     * @param executor is an instance of {@link org.openqa.selenium.remote.HttpCommandExecutor}
+     * Creates a new instance based on command {@code executor} and {@code capabilities}.
+     *
+     * @param executor is an instance of {@link HttpCommandExecutor}
      *                 or class that extends it. Default commands or another vendor-specific
      *                 commands may be specified there.
-     * @param capabilities take a look
-     *                     at {@link org.openqa.selenium.Capabilities}
+     * @param capabilities take a look at {@link Capabilities}
      */
     public AppiumDriver(HttpCommandExecutor executor, Capabilities capabilities) {
         super(executor, capabilities);
@@ -129,6 +130,8 @@ public AppiumDriver(Capabilities desiredCapabilities) {
     }
 
     /**
+     * Changes platform name and returns new capabilities.
+     *
      * @param originalCapabilities the given {@link Capabilities}.
      * @param newPlatform a {@link MobileCapabilityType#PLATFORM_NAME} value which has
      *                    to be set up
diff --git a/src/main/java/io/appium/java_client/AppiumFluentWait.java b/src/main/java/io/appium/java_client/AppiumFluentWait.java
index bdc04c7dc..635835aad 100644
--- a/src/main/java/io/appium/java_client/AppiumFluentWait.java
+++ b/src/main/java/io/appium/java_client/AppiumFluentWait.java
@@ -94,6 +94,8 @@ public Duration getInterval() {
     }
 
     /**
+     * The input value to pass to the evaluated conditions.
+     *
      * @param input The input value to pass to the evaluated conditions.
      */
     public AppiumFluentWait(T input) {
@@ -101,6 +103,8 @@ public AppiumFluentWait(T input) {
     }
 
     /**
+     * Creates wait object based on {@code input} value, {@code clock} and {@code sleeper}.
+     *
      * @param input   The input value to pass to the evaluated conditions.
      * @param clock   The clock to use when measuring the timeout.
      * @param sleeper Used to put the thread to sleep between evaluation loops.
@@ -211,10 +215,9 @@ public AppiumFluentWait<T> withPollingStrategy(Function<IterationInfo, Duration>
      * <ol>
      * <li>the function returns neither null nor false,</li>
      * <li>the function throws an unignored exception,</li>
-     * <li>the timeout expires,
-     * <li>
+     * <li>the timeout expires,</li>
      * <li>the current thread is interrupted</li>
-     * </ol>
+     * </ol>.
      *
      * @param isTrue the parameter to pass to the expected condition
      * @param <V>    The function's expected return type.
diff --git a/src/main/java/io/appium/java_client/DefaultGenericMobileDriver.java b/src/main/java/io/appium/java_client/DefaultGenericMobileDriver.java
index 6376a265f..b209b51cf 100644
--- a/src/main/java/io/appium/java_client/DefaultGenericMobileDriver.java
+++ b/src/main/java/io/appium/java_client/DefaultGenericMobileDriver.java
@@ -71,13 +71,17 @@ public DefaultGenericMobileDriver(CommandExecutor executor, Capabilities desired
     }
 
     /**
-     * @throws WebDriverException his method doesn't work against native app UI.
+     * Finds a single element by link text.
+     *
+     * @throws WebDriverException This method doesn't work against native app UI.
      */
     public T findElementByLinkText(String using) throws WebDriverException {
         return (T) super.findElementByLinkText(using);
     }
 
     /**
+     * Finds many elements by link text.
+     *
      * @throws WebDriverException This method doesn't work against native app UI.
      */
     public List findElementsByLinkText(String using) throws WebDriverException {
@@ -85,13 +89,17 @@ public List findElementsByLinkText(String using) throws WebDriverException {
     }
 
     /**
-     * @throws WebDriverException his method doesn't work against native app UI.
+     * Finds a single element by partial link text.
+     *
+     * @throws WebDriverException This method doesn't work against native app UI.
      */
     public T findElementByPartialLinkText(String using) throws WebDriverException {
         return (T) super.findElementByPartialLinkText(using);
     }
 
     /**
+     * Finds many elements by partial link text.
+     *
      * @throws WebDriverException This method doesn't work against native app UI.
      */
     public List findElementsByPartialLinkText(String using) throws WebDriverException {
@@ -123,13 +131,17 @@ public List findElementsByClassName(String using) {
     }
 
     /**
-     * @throws WebDriverException his method doesn't work against native app UI.
+     * Finds a single element by CSS selector.
+     *
+     * @throws WebDriverException This method doesn't work against native app UI.
      */
     public T findElementByCssSelector(String using) throws WebDriverException {
         return (T) super.findElementByCssSelector(using);
     }
 
     /**
+     * Finds many elements by CSS selector.
+     *
      * @throws WebDriverException This method doesn't work against native app UI.
      */
     public List findElementsByCssSelector(String using) throws WebDriverException {
diff --git a/src/main/java/io/appium/java_client/DefaultGenericMobileElement.java b/src/main/java/io/appium/java_client/DefaultGenericMobileElement.java
index 085ad85a0..5b62c485e 100644
--- a/src/main/java/io/appium/java_client/DefaultGenericMobileElement.java
+++ b/src/main/java/io/appium/java_client/DefaultGenericMobileElement.java
@@ -74,13 +74,17 @@ abstract class DefaultGenericMobileElement<T extends WebElement> extends RemoteW
     }
 
     /**
-     * @throws WebDriverException his method doesn't work against native app UI.
+     * Finds a single element by link text.
+     *
+     * @throws WebDriverException This method doesn't work against native app UI.
      */
     public T findElementByLinkText(String using) throws WebDriverException {
         return (T) super.findElementByLinkText(using);
     }
 
     /**
+     * Finds many elements by link text.
+     *
      * @throws WebDriverException This method doesn't work against native app UI.
      */
     public List findElementsByLinkText(String using) throws WebDriverException {
@@ -88,13 +92,17 @@ public List findElementsByLinkText(String using) throws WebDriverException {
     }
 
     /**
-     * @throws WebDriverException his method doesn't work against native app UI.
+     * Finds a single element by partial link text.
+     *
+     * @throws WebDriverException This method doesn't work against native app UI.
      */
     public T findElementByPartialLinkText(String using) throws WebDriverException {
         return (T) super.findElementByPartialLinkText(using);
     }
 
     /**
+     * Finds many elements by partial link text.
+     *
      * @throws WebDriverException This method doesn't work against native app UI.
      */
     public List findElementsByPartialLinkText(String using) throws WebDriverException {
@@ -126,13 +134,17 @@ public List findElementsByClassName(String using) {
     }
 
     /**
-     * @throws WebDriverException his method doesn't work against native app UI.
+     * Finds a single element by CSS selector.
+     *
+     * @throws WebDriverException This method doesn't work against native app UI.
      */
     public T findElementByCssSelector(String using) throws WebDriverException {
         return (T) super.findElementByCssSelector(using);
     }
 
     /**
+     * Finds many elements by CSS selector.
+     *
      * @throws WebDriverException This method doesn't work against native app UI.
      */
     public List findElementsByCssSelector(String using) throws WebDriverException {
@@ -148,6 +160,8 @@ public List findElementsByXPath(String using) {
     }
 
     /**
+     * {@inheritDoc}
+     *
      * @throws WebDriverException because it may not work against native app UI.
      */
     public void submit() throws WebDriverException {
@@ -155,6 +169,8 @@ public void submit() throws WebDriverException {
     }
 
     /**
+     * {@inheritDoc}
+     *
      * @throws WebDriverException because it may not work against native app UI.
      */
     public String getCssValue(String propertyName) throws WebDriverException {
diff --git a/src/main/java/io/appium/java_client/ErrorCodesMobile.java b/src/main/java/io/appium/java_client/ErrorCodesMobile.java
index c353e1fdc..924625b08 100644
--- a/src/main/java/io/appium/java_client/ErrorCodesMobile.java
+++ b/src/main/java/io/appium/java_client/ErrorCodesMobile.java
@@ -54,6 +54,9 @@ public Class<? extends WebDriverException> getExceptionType(int statusCode) {
     }
 
     /**
+     * Returns the exception type that corresponds to the given {@code message}or {@code null} if
+     * there are no matching mobile exceptions.
+     *
      * @param message message An error message returned by Appium server
      * @return The exception type that corresponds to the provided error message or {@code null} if
      *     there are no matching mobile exceptions.
diff --git a/src/main/java/io/appium/java_client/FindsByAccessibilityId.java b/src/main/java/io/appium/java_client/FindsByAccessibilityId.java
index 382ed85f3..4d79a33a4 100644
--- a/src/main/java/io/appium/java_client/FindsByAccessibilityId.java
+++ b/src/main/java/io/appium/java_client/FindsByAccessibilityId.java
@@ -24,6 +24,12 @@
 
 public interface FindsByAccessibilityId<T extends WebElement> extends FindsByFluentSelector<T> {
     /**
+     * Method performs the searching for a single element by accessibility ID selector
+     * and value of the given selector.
+     *
+     * @param using an accessibility ID selector
+     * @return The first element that matches the given selector
+     *
      * @throws WebDriverException This method is not applicable with browser/webview UI.
      * @throws NoSuchElementException when no one element is found
      */
@@ -32,6 +38,12 @@ default T findElementByAccessibilityId(String using) {
     }
 
     /**
+     * Method performs the searching for a list of elements by accessibility ID selector
+     * and value of the given selector.
+     *
+     * @param using an accessibility ID selector
+     * @return a list of elements that match the given selector
+     *
      * @throws WebDriverException This method is not applicable with browser/webview UI.
      */
     default List<T> findElementsByAccessibilityId(String using) {
diff --git a/src/main/java/io/appium/java_client/FindsByAndroidUIAutomator.java b/src/main/java/io/appium/java_client/FindsByAndroidUIAutomator.java
index 60b8a5fd5..50c7bafba 100644
--- a/src/main/java/io/appium/java_client/FindsByAndroidUIAutomator.java
+++ b/src/main/java/io/appium/java_client/FindsByAndroidUIAutomator.java
@@ -25,6 +25,12 @@
 public interface FindsByAndroidUIAutomator<T extends WebElement> extends FindsByFluentSelector<T> {
 
     /**
+     * Method performs the searching for a single element by Android UIAutomator selector
+     * and value of the given selector.
+     *
+     * @param using an Android UIAutomator selector
+     * @return The first element that matches the given selector
+     *
      * @throws WebDriverException This method is not applicable with browser/webview UI.
      * @throws NoSuchElementException when no one element is found
      */
@@ -33,6 +39,12 @@ default T findElementByAndroidUIAutomator(String using) {
     }
 
     /**
+     * Method performs the searching for a list of elements by Android UIAutomator selector
+     * and value of the given selector.
+     *
+     * @param using an Android UIAutomator selector
+     * @return a list of elements that match the given selector
+     *
      * @throws WebDriverException This method is not applicable with browser/webview UI.
      */
     default List<T> findElementsByAndroidUIAutomator(String using) {
diff --git a/src/main/java/io/appium/java_client/FindsByFluentSelector.java b/src/main/java/io/appium/java_client/FindsByFluentSelector.java
index 037bcf427..f545f47be 100644
--- a/src/main/java/io/appium/java_client/FindsByFluentSelector.java
+++ b/src/main/java/io/appium/java_client/FindsByFluentSelector.java
@@ -24,7 +24,7 @@ public interface FindsByFluentSelector<T extends WebElement> {
 
     /**
     * Method performs the searching for a single element by some selector defined by string
-    * and value of the given selector
+    * and value of the given selector.
     *
     * @param by is a string selector
     * @param using is a value of the given selector
@@ -38,7 +38,7 @@ public interface FindsByFluentSelector<T extends WebElement> {
 
     /**
     * Method performs the searching for a list of elements by some selector defined by string
-    * and value of the given selector
+    * and value of the given selector.
     *
     * @param by is a string selector
     * @param using is a value of the given selector
diff --git a/src/main/java/io/appium/java_client/FindsByIosUIAutomation.java b/src/main/java/io/appium/java_client/FindsByIosUIAutomation.java
index 57c4c54b4..f1badeaca 100644
--- a/src/main/java/io/appium/java_client/FindsByIosUIAutomation.java
+++ b/src/main/java/io/appium/java_client/FindsByIosUIAutomation.java
@@ -24,6 +24,12 @@
 
 public interface FindsByIosUIAutomation<T extends WebElement> extends FindsByFluentSelector<T> {
     /**
+     * Method performs the searching for a single element by iOS UIAutomation selector
+     * and value of the given selector.
+     *
+     * @param using an iOS UIAutomation selector
+     * @return The first element that matches the given selector
+     *
      * @throws WebDriverException This method is not applicable with browser/webview UI.
      * @throws NoSuchElementException when no one element is found
      */
@@ -32,6 +38,12 @@ default T findElementByIosUIAutomation(String using) {
     }
 
     /**
+     * Method performs the searching for a list of elements by iOS UIAutomation selector
+     * and value of the given selector.
+     *
+     * @param using an iOS UIAutomation selector
+     * @return a list of elements that match the given selector
+     *
      * @throws WebDriverException This method is not applicable with browser/webview UI.
      */
     default List<T> findElementsByIosUIAutomation(String using) {
diff --git a/src/main/java/io/appium/java_client/HasSessionDetails.java b/src/main/java/io/appium/java_client/HasSessionDetails.java
index cefdfdf3d..b743363e5 100644
--- a/src/main/java/io/appium/java_client/HasSessionDetails.java
+++ b/src/main/java/io/appium/java_client/HasSessionDetails.java
@@ -30,8 +30,9 @@
 
 public interface HasSessionDetails extends ExecutesMethod {
     /**
-     * @return a map with values that hold session details.
+     * The current session details.
      *
+     * @return a map with values that hold session details.
      */
     @SuppressWarnings("unchecked")
     default Map<String, Object> getSessionDetails() {
@@ -56,6 +57,8 @@ default Map<String, Object> getSessionDetails() {
     }
 
     /**
+     * The current mobile platform.
+     *
      * @return name of the current mobile platform.
      */
     default @Nullable String getPlatformName() {
@@ -65,6 +68,8 @@ default Map<String, Object> getSessionDetails() {
     }
 
     /**
+     * The current automation name.
+     *
      * @return current automation name.
      */
     default @Nullable String  getAutomationName() {
@@ -73,6 +78,8 @@ default Map<String, Object> getSessionDetails() {
     }
 
     /**
+     * Checks if focus is on browser.
+     *
      * @return is focus on browser or on native content.
      */
     default boolean isBrowser() {
diff --git a/src/main/java/io/appium/java_client/HidesKeyboardWithKeyName.java b/src/main/java/io/appium/java_client/HidesKeyboardWithKeyName.java
index d03473bd0..2549ad018 100644
--- a/src/main/java/io/appium/java_client/HidesKeyboardWithKeyName.java
+++ b/src/main/java/io/appium/java_client/HidesKeyboardWithKeyName.java
@@ -16,7 +16,6 @@
 
 package io.appium.java_client;
 
-
 import static io.appium.java_client.MobileCommand.hideKeyboardCommand;
 
 public interface HidesKeyboardWithKeyName extends HidesKeyboard {
diff --git a/src/main/java/io/appium/java_client/InteractsWithFiles.java b/src/main/java/io/appium/java_client/InteractsWithFiles.java
index 2f60a3d66..4bc7ac9a1 100644
--- a/src/main/java/io/appium/java_client/InteractsWithFiles.java
+++ b/src/main/java/io/appium/java_client/InteractsWithFiles.java
@@ -28,6 +28,8 @@
 public interface InteractsWithFiles extends ExecutesMethod {
 
     /**
+     * Pull a file from the simulator/device.
+     *
      * @param remotePath On Android and iOS, this is either the path to the file
      *                   (relative to the root of the app's file system). On iOS only,
      *                   if path starts with /AppName.app, which will be replaced with
diff --git a/src/main/java/io/appium/java_client/MobileBy.java b/src/main/java/io/appium/java_client/MobileBy.java
index c4209523d..12f8de36a 100644
--- a/src/main/java/io/appium/java_client/MobileBy.java
+++ b/src/main/java/io/appium/java_client/MobileBy.java
@@ -98,7 +98,7 @@ public static By AccessibilityId(final String accessibilityId) {
     }
 
     /**
-     * This locator strategy is available in XCUITest Driver mode
+     * This locator strategy is available in XCUITest Driver mode.
      * @param iOSClassChainString is a valid class chain locator string.
      *                            See <a href="https://github.com/facebook/WebDriverAgent/wiki/Queries">
      *                            the documentation</a> for more details
@@ -109,7 +109,7 @@ public static By iOSClassChain(final String iOSClassChainString) {
     }
 
     /**
-    * This locator strategy is available in XCUITest Driver mode
+    * This locator strategy is available in XCUITest Driver mode.
     * @param iOSNsPredicateString is an an iOS NsPredicate String
     * @return an instance of {@link io.appium.java_client.MobileBy.ByIosNsPredicate}
     */
@@ -128,6 +128,8 @@ public ByIosUIAutomation(String iOSAutomationText) {
         }
 
         /**
+         * {@inheritDoc}
+         *
          * @throws WebDriverException when current session doesn't support the given selector or when
          *      value of the selector is not consistent.
          * @throws IllegalArgumentException when it is impossible to find something on the given
@@ -153,6 +155,8 @@ public List<WebElement> findElements(SearchContext context) throws WebDriverExce
         }
 
         /**
+         * {@inheritDoc}
+         *
          * @throws WebDriverException when current session doesn't support the given selector or when
          *      value of the selector is not consistent.
          * @throws IllegalArgumentException when it is impossible to find something on the given
@@ -189,6 +193,8 @@ public ByAndroidUIAutomator(String uiautomatorText) {
         }
 
         /**
+         * {@inheritDoc}
+         *
          * @throws WebDriverException when current session doesn't support the given selector or when
          *      value of the selector is not consistent.
          * @throws IllegalArgumentException when it is impossible to find something on the given
@@ -214,6 +220,8 @@ public List<WebElement> findElements(SearchContext context) throws WebDriverExce
         }
 
         /**
+         * {@inheritDoc}
+         *
          * @throws WebDriverException when current session doesn't support the given selector or when
          *      value of the selector is not consistent.
          * @throws IllegalArgumentException when it is impossible to find something on the given
@@ -249,6 +257,8 @@ public ByAccessibilityId(String accessibilityId) {
         }
 
         /**
+         * {@inheritDoc}
+         *
          * @throws WebDriverException when current session doesn't support the given selector or when
          *      value of the selector is not consistent.
          * @throws IllegalArgumentException when it is impossible to find something on the given
@@ -274,6 +284,8 @@ public List<WebElement> findElements(SearchContext context) throws WebDriverExce
         }
 
         /**
+         * {@inheritDoc}
+         *
          * @throws WebDriverException when current session doesn't support the given selector or when
          *      value of the selector is not consistent.
          * @throws IllegalArgumentException when it is impossible to find something on the given
@@ -308,6 +320,8 @@ protected ByIosClassChain(String locatorString) {
         }
 
         /**
+         * {@inheritDoc}
+         *
          * @throws WebDriverException when current session doesn't support the given selector or when
          *      value of the selector is not consistent.
          * @throws IllegalArgumentException when it is impossible to find something on the given
@@ -331,6 +345,8 @@ protected ByIosClassChain(String locatorString) {
         }
 
         /**
+         * {@inheritDoc}
+         *
          * @throws WebDriverException when current session doesn't support the given selector or when
          *      value of the selector is not consistent.
          * @throws IllegalArgumentException when it is impossible to find something on the given
@@ -364,6 +380,8 @@ protected ByIosNsPredicate(String locatorString) {
         }
 
         /**
+         * {@inheritDoc}
+         *
          * @throws WebDriverException when current session doesn't support the given selector or when
          *      value of the selector is not consistent.
          * @throws IllegalArgumentException when it is impossible to find something on the given
@@ -387,6 +405,8 @@ protected ByIosNsPredicate(String locatorString) {
         }
 
         /**
+         * {@inheritDoc}
+         *
          * @throws WebDriverException when current session doesn't support the given selector or when
          *      value of the selector is not consistent.
          * @throws IllegalArgumentException when it is impossible to find something on the given
@@ -420,6 +440,8 @@ protected ByWindowsAutomation(String locatorString) {
         }
 
         /**
+         * {@inheritDoc}
+         *
          * @throws WebDriverException when current session doesn't support the given selector or when
          *      value of the selector is not consistent.
          * @throws IllegalArgumentException when it is impossible to find something on the given
@@ -443,6 +465,8 @@ protected ByWindowsAutomation(String locatorString) {
         }
 
         /**
+         * {@inheritDoc}
+         *
          * @throws WebDriverException when current session doesn't support the given selector or when
          *      value of the selector is not consistent.
          * @throws IllegalArgumentException when it is impossible to find something on the given
diff --git a/src/main/java/io/appium/java_client/MobileCommand.java b/src/main/java/io/appium/java_client/MobileCommand.java
index bb43506ff..421649a72 100644
--- a/src/main/java/io/appium/java_client/MobileCommand.java
+++ b/src/main/java/io/appium/java_client/MobileCommand.java
@@ -252,6 +252,8 @@ public static AppiumCommandInfo deleteC(String url) {
     }
 
     /**
+     * Prepares single argument.
+     *
      * @param param is a parameter name.
      * @param value is the parameter value.
      * @return built {@link ImmutableMap}.
@@ -264,6 +266,8 @@ public static ImmutableMap<String, Object> prepareArguments(String param,
     }
 
     /**
+     * Prepares collection of arguments.
+     *
      * @param params is the array with parameter names.
      * @param values is the array with parameter values.
      * @return built {@link ImmutableMap}.
@@ -363,7 +367,7 @@ public static ImmutableMap<String, Object> prepareArguments(String[] params,
 
     /**
      * This method forms a {@link java.util.Map} of parameters for the
-     * file pushing
+     * file pushing.
      *
      * @param remotePath Path to file to write data to on remote device
      * @param base64Data Base64 encoded byte array of data to write to remote device
diff --git a/src/main/java/io/appium/java_client/android/AndroidDriver.java b/src/main/java/io/appium/java_client/android/AndroidDriver.java
index 129ae01ea..6018f6a3b 100644
--- a/src/main/java/io/appium/java_client/android/AndroidDriver.java
+++ b/src/main/java/io/appium/java_client/android/AndroidDriver.java
@@ -35,6 +35,8 @@
 import java.net.URL;
 
 /**
+ * Android driver implementation.
+ *
  * @param <T> the required type of class which implement {@link org.openqa.selenium.WebElement}.
  *           Instances of the defined type will be returned via findElement* and findElements*.
  *           Warning (!!!). Allowed types:
@@ -52,33 +54,33 @@ public class AndroidDriver<T extends WebElement>
     private static final String ANDROID_PLATFORM = MobilePlatform.ANDROID;
 
     /**
-     * @param executor is an instance of {@link org.openqa.selenium.remote.HttpCommandExecutor}
+     * Creates a new instance based on command {@code executor} and {@code capabilities}.
+     *
+     * @param executor is an instance of {@link HttpCommandExecutor}
      *                 or class that extends it. Default commands or another vendor-specific
      *                 commands may be specified there.
-     * @param capabilities take a look
-     *                     at {@link org.openqa.selenium.Capabilities}
+     * @param capabilities take a look at {@link Capabilities}
      */
     public AndroidDriver(HttpCommandExecutor executor, Capabilities capabilities) {
         super(executor, substituteMobilePlatform(capabilities, ANDROID_PLATFORM));
     }
 
     /**
-     * @param remoteAddress is the address of remotely/locally
-     *                      started Appium server
-     * @param desiredCapabilities take a look
-     *                            at {@link org.openqa.selenium.Capabilities}
+     * Creates a new instance based on Appium server URL and {@code capabilities}.
+     *
+     * @param remoteAddress is the address of remotely/locally started Appium server
+     * @param desiredCapabilities take a look at {@link Capabilities}
      */
     public AndroidDriver(URL remoteAddress, Capabilities desiredCapabilities) {
         super(remoteAddress, substituteMobilePlatform(desiredCapabilities, ANDROID_PLATFORM));
     }
 
     /**
-     * @param remoteAddress is the address of remotely/locally
-     *                      started Appium server
-     * @param httpClientFactory take a look
-     *                          at {@link org.openqa.selenium.remote.http.HttpClient.Factory}
-     * @param desiredCapabilities take a look
-     *                            at {@link org.openqa.selenium.Capabilities}
+     * Creates a new instance based on Appium server URL, HTTP client factory and {@code capabilities}.
+     *
+     * @param remoteAddress is the address of remotely/locally started Appium server
+     * @param httpClientFactory take a look at {@link HttpClient.Factory}
+     * @param desiredCapabilities take a look at {@link Capabilities}
      */
     public AndroidDriver(URL remoteAddress, HttpClient.Factory httpClientFactory,
         Capabilities desiredCapabilities) {
@@ -87,22 +89,21 @@ public AndroidDriver(URL remoteAddress, HttpClient.Factory httpClientFactory,
     }
 
     /**
-     * @param service take a look
-     *                at {@link io.appium.java_client.service.local.AppiumDriverLocalService}
-     * @param desiredCapabilities take a look
-     *                            at {@link org.openqa.selenium.Capabilities}
+     * Creates a new instance based on Appium driver local service and {@code capabilities}.
+     *
+     * @param service take a look at {@link AppiumDriverLocalService}
+     * @param desiredCapabilities take a look at {@link Capabilities}
      */
     public AndroidDriver(AppiumDriverLocalService service, Capabilities desiredCapabilities) {
         super(service, substituteMobilePlatform(desiredCapabilities, ANDROID_PLATFORM));
     }
 
     /**
-     * @param service take a look
-     *                at {@link io.appium.java_client.service.local.AppiumDriverLocalService}
-     * @param httpClientFactory take a look
-     *                          at {@link org.openqa.selenium.remote.http.HttpClient.Factory}
-     * @param desiredCapabilities take a look
-     *                            at {@link org.openqa.selenium.Capabilities}
+     * Creates a new instance based on Appium driver local service, HTTP client factory and {@code capabilities}.
+     *
+     * @param service take a look at {@link AppiumDriverLocalService}
+     * @param httpClientFactory take a look at {@link HttpClient.Factory}
+     * @param desiredCapabilities take a look at {@link Capabilities}
      */
     public AndroidDriver(AppiumDriverLocalService service, HttpClient.Factory httpClientFactory,
         Capabilities desiredCapabilities) {
@@ -111,22 +112,21 @@ public AndroidDriver(AppiumDriverLocalService service, HttpClient.Factory httpCl
     }
 
     /**
-     * @param builder take a look
-     *                at {@link io.appium.java_client.service.local.AppiumServiceBuilder}
-     * @param desiredCapabilities take a look
-     *                            at {@link org.openqa.selenium.Capabilities}
+     * Creates a new instance based on Appium service builder and {@code capabilities}.
+     *
+     * @param builder take a look at {@link AppiumServiceBuilder}
+     * @param desiredCapabilities take a look at {@link Capabilities}
      */
     public AndroidDriver(AppiumServiceBuilder builder, Capabilities desiredCapabilities) {
         super(builder, substituteMobilePlatform(desiredCapabilities, ANDROID_PLATFORM));
     }
 
     /**
-     * @param builder take a look
-     *                at {@link io.appium.java_client.service.local.AppiumServiceBuilder}
-     * @param httpClientFactory take a look
-     *                          at {@link org.openqa.selenium.remote.http.HttpClient.Factory}
-     * @param desiredCapabilities take a look
-     *                            at {@link org.openqa.selenium.Capabilities}
+     * Creates a new instance based on Appium service builder, HTTP client factory and {@code capabilities}.
+     *
+     * @param builder take a look at {@link AppiumServiceBuilder}
+     * @param httpClientFactory take a look at {@link HttpClient.Factory}
+     * @param desiredCapabilities take a look at {@link Capabilities}
      */
     public AndroidDriver(AppiumServiceBuilder builder, HttpClient.Factory httpClientFactory,
         Capabilities desiredCapabilities) {
@@ -135,18 +135,19 @@ public AndroidDriver(AppiumServiceBuilder builder, HttpClient.Factory httpClient
     }
 
     /**
-     * @param httpClientFactory take a look
-     *                          at {@link org.openqa.selenium.remote.http.HttpClient.Factory}
-     * @param desiredCapabilities take a look
-     *                            at {@link org.openqa.selenium.Capabilities}
+     * Creates a new instance based on HTTP client factory and {@code capabilities}.
+     *
+     * @param httpClientFactory take a look at {@link HttpClient.Factory}
+     * @param desiredCapabilities take a look at {@link Capabilities}
      */
     public AndroidDriver(HttpClient.Factory httpClientFactory, Capabilities desiredCapabilities) {
         super(httpClientFactory, substituteMobilePlatform(desiredCapabilities, ANDROID_PLATFORM));
     }
 
     /**
-     * @param desiredCapabilities take a look
-     *                            at {@link org.openqa.selenium.Capabilities}
+     * Creates a new instance based on {@code capabilities}.
+     *
+     * @param desiredCapabilities take a look at {@link Capabilities}
      */
     public AndroidDriver(Capabilities desiredCapabilities) {
         super(substituteMobilePlatform(desiredCapabilities, ANDROID_PLATFORM));
diff --git a/src/main/java/io/appium/java_client/android/AndroidMobileCommandHelper.java b/src/main/java/io/appium/java_client/android/AndroidMobileCommandHelper.java
index 375eed815..3bae85839 100644
--- a/src/main/java/io/appium/java_client/android/AndroidMobileCommandHelper.java
+++ b/src/main/java/io/appium/java_client/android/AndroidMobileCommandHelper.java
@@ -35,11 +35,9 @@
 public class AndroidMobileCommandHelper extends MobileCommand {
 
     /**
-     * This method forms a {@link java.util.Map} of parameters for the
-     * getting of the current activity.
+     * This method forms a {@link Map} of parameters for the getting of the current activity.
      *
-     * @return a key-value pair. The key is the command name. The value is a
-     * {@link java.util.Map} command arguments.
+     * @return a key-value pair. The key is the command name. The value is a {@link Map} command arguments.
      */
     public static Map.Entry<String, Map<String, ?>> currentActivityCommand() {
         return new AbstractMap.SimpleEntry<>(
@@ -47,11 +45,9 @@ public class AndroidMobileCommandHelper extends MobileCommand {
     }
 
     /**
-     * This method forms a {@link java.util.Map} of parameters for the
-     * getting of the current package.
+     * This method forms a {@link Map} of parameters for the getting of the current package.
      *
-     * @return a key-value pair. The key is the command name. The value is a
-     * {@link java.util.Map} command arguments.
+     * @return a key-value pair. The key is the command name. The value is a {@link Map} command arguments.
      */
     public static Map.Entry<String, Map<String, ?>> currentPackageCommand() {
         return new AbstractMap.SimpleEntry<>(
@@ -59,13 +55,11 @@ public class AndroidMobileCommandHelper extends MobileCommand {
     }
 
     /**
-     * This method forms a {@link java.util.Map} of parameters for the
-     * ending of the test coverage.
+     * This method forms a {@link Map} of parameters for the ending of the test coverage.
      *
      * @param intent intent to broadcast.
      * @param path   path to .ec file.
-     * @return a key-value pair. The key is the command name. The value is a
-     * {@link java.util.Map} command arguments.
+     * @return a key-value pair. The key is the command name. The value is a {@link Map} command arguments.
      */
     public static Map.Entry<String, Map<String, ?>> endTestCoverageCommand(String intent,
         String path) {
@@ -125,11 +119,11 @@ public class AndroidMobileCommandHelper extends MobileCommand {
     }
 
     /**
-     * This method forms a {@link java.util.Map} of parameters to
+     * This method forms a {@link Map} of parameters to
      * Retrieve the display density of the Android device.
      *
      * @return a key-value pair. The key is the command name. The value is a
-     * {@link java.util.Map} command arguments.
+     * {@link Map} command arguments.
      */
     public static Map.Entry<String, Map<String, ?>> getDisplayDensityCommand() {
         return new AbstractMap.SimpleEntry<>(
@@ -137,11 +131,10 @@ public class AndroidMobileCommandHelper extends MobileCommand {
     }
 
     /**
-     * This method forms a {@link java.util.Map} of parameters for the
-     * getting of a network connection value.
+     * This method forms a {@link Map} of parameters for the getting of a network connection value.
      *
      * @return a key-value pair. The key is the command name. The value is a
-     * {@link java.util.Map} command arguments.
+     * {@link Map} command arguments.
      */
     public static Map.Entry<String, Map<String, ?>> getNetworkConnectionCommand() {
         return new AbstractMap.SimpleEntry<>(
@@ -149,11 +142,10 @@ public class AndroidMobileCommandHelper extends MobileCommand {
     }
 
     /**
-     * This method forms a {@link java.util.Map} of parameters to
+     * This method forms a {@link Map} of parameters to
      * Retrieve visibility and bounds information of the status and navigation bars.
      *
-     * @return a key-value pair. The key is the command name. The value is a
-     * {@link java.util.Map} command arguments.
+     * @return a key-value pair. The key is the command name. The value is a {@link Map} command arguments.
      */
     public static Map.Entry<String, Map<String, ?>> getSystemBarsCommand() {
         return new AbstractMap.SimpleEntry<>(
@@ -161,11 +153,9 @@ public class AndroidMobileCommandHelper extends MobileCommand {
     }
 
     /**
-     * This method forms a {@link java.util.Map} of parameters for the
-     * checking of the keyboard state (is it shown or not).
+     * This method forms a {@link Map} of parameters for the checking of the keyboard state (is it shown or not).
      *
-     * @return a key-value pair. The key is the command name. The value is a
-     * {@link java.util.Map} command arguments.
+     * @return a key-value pair. The key is the command name. The value is a {@link Map} command arguments.
      */
     public static Map.Entry<String, Map<String, ?>> isKeyboardShownCommand() {
         return new AbstractMap.SimpleEntry<>(
@@ -173,11 +163,9 @@ public class AndroidMobileCommandHelper extends MobileCommand {
     }
 
     /**
-     * This method forms a {@link java.util.Map} of parameters for the
-     * checking of the device state (is it locked or not).
+     * This method forms a {@link Map} of parameters for the checking of the device state (is it locked or not).
      *
-     * @return a key-value pair. The key is the command name. The value is a
-     * {@link java.util.Map} command arguments.
+     * @return a key-value pair. The key is the command name. The value is a {@link Map} command arguments.
      */
     public static Map.Entry<String, Map<String, ?>> isLockedCommand() {
         return new AbstractMap.SimpleEntry<>(
@@ -185,12 +173,10 @@ public class AndroidMobileCommandHelper extends MobileCommand {
     }
 
     /**
-     * This method forms a {@link java.util.Map} of parameters for the
-     * finger print authentication invocation.
+     * This method forms a {@link Map} of parameters for the finger print authentication invocation.
      *
      * @param fingerPrintId finger prints stored in Android Keystore system (from 1 to 10)
-     * @return a key-value pair. The key is the command name. The value is a
-     * {@link java.util.Map} command arguments.
+     * @return a key-value pair. The key is the command name. The value is a {@link Map} command arguments.
      */
     public static Map.Entry<String, Map<String, ?>> fingerPrintCommand(int fingerPrintId) {
         return new AbstractMap.SimpleEntry<>(FINGER_PRINT,
@@ -198,11 +184,9 @@ public class AndroidMobileCommandHelper extends MobileCommand {
     }
 
     /**
-     * This method forms a {@link java.util.Map} of parameters for the
-     * notification opening.
+     * This method forms a {@link Map} of parameters for the notification opening.
      *
-     * @return a key-value pair. The key is the command name. The value is a
-     * {@link java.util.Map} command arguments.
+     * @return a key-value pair. The key is the command name. The value is a {@link Map} command arguments.
      */
     public static Map.Entry<String, Map<String, ?>> openNotificationsCommand() {
         return new AbstractMap.SimpleEntry<>(
@@ -210,12 +194,10 @@ public class AndroidMobileCommandHelper extends MobileCommand {
     }
 
     /**
-     * This method forms a {@link java.util.Map} of parameters for the
-     * setting of device network connection.
+     * This method forms a {@link Map} of parameters for the setting of device network connection.
      *
      * @param connection The bitmask of the desired connection
-     * @return a key-value pair. The key is the command name. The value is a
-     * {@link java.util.Map} command arguments.
+     * @return a key-value pair. The key is the command name. The value is a {@link Map} command arguments.
      */
     public static Map.Entry<String, Map<String, ?>> setConnectionCommand(Connection connection) {
         String[] parameters = new String[] {"name", "parameters"};
@@ -226,8 +208,7 @@ public class AndroidMobileCommandHelper extends MobileCommand {
     }
 
     /**
-     * This method forms a {@link java.util.Map} of parameters for the
-     * activity starting.
+     * This method forms a {@link Map} of parameters for the activity starting.
      *
      * @param appPackage      The package containing the activity. [Required]
      * @param appActivity     The activity to start. [Required]
@@ -238,8 +219,8 @@ public class AndroidMobileCommandHelper extends MobileCommand {
      * @param intentFlags  Flags that will be used to start activity [Optional]
      * @param optionalIntentArguments Additional intent arguments that will be used to
      *                                start activity [Optional]
-     * @return a key-value pair. The key is the command name. The value is a
-     * {@link java.util.Map} command arguments.
+     * @param stopApp         Stop app on reset or not
+     * @return a key-value pair. The key is the command name. The value is a {@link Map} command arguments.
      * @throws IllegalArgumentException when any required argument is empty
      */
     public static Map.Entry<String, Map<String, ?>> startActivityCommand(String appPackage,
@@ -274,22 +255,18 @@ public class AndroidMobileCommandHelper extends MobileCommand {
     }
 
     /**
-     * This method forms a {@link java.util.Map} of parameters for the
-     * toggling of  location services.
+     * This method forms a {@link Map} of parameters for the toggling of  location services.
      *
-     * @return a key-value pair. The key is the command name. The value is a
-     * {@link java.util.Map} command arguments.
+     * @return a key-value pair. The key is the command name. The value is a {@link Map} command arguments.
      */
     public static Map.Entry<String, Map<String, ?>> toggleLocationServicesCommand() {
         return new AbstractMap.SimpleEntry<>(TOGGLE_LOCATION_SERVICES, ImmutableMap.<String, Object>of());
     }
 
     /**
-     * This method forms a {@link java.util.Map} of parameters for the
-     * device unlocking.
+     * This method forms a {@link Map} of parameters for the device unlocking.
      *
-     * @return a key-value pair. The key is the command name. The value is a
-     * {@link java.util.Map} command arguments.
+     * @return a key-value pair. The key is the command name. The value is a {@link Map} command arguments.
      */
     public static Map.Entry<String, Map<String, ?>> unlockCommand() {
         return new AbstractMap.SimpleEntry<>(UNLOCK, ImmutableMap.<String, Object>of());
@@ -297,13 +274,12 @@ public class AndroidMobileCommandHelper extends MobileCommand {
 
 
     /**
-     * This method forms a {@link java.util.Map} of parameters for the element
+     * This method forms a {@link Map} of parameters for the element
      * value replacement. It is used against input elements
      *
      * @param hasIdentityObject an instance which contains an element ID
      * @param value a new value
-     * @return a key-value pair. The key is the command name. The value is a
-     * {@link java.util.Map} command arguments.
+     * @return a key-value pair. The key is the command name. The value is a {@link Map} command arguments.
      */
     public static Map.Entry<String, Map<String, ?>>  replaceElementValueCommand(
         HasIdentity hasIdentityObject, String value) {
diff --git a/src/main/java/io/appium/java_client/android/HasAndroidSettings.java b/src/main/java/io/appium/java_client/android/HasAndroidSettings.java
index 220dfcb48..b9e7e1f2c 100644
--- a/src/main/java/io/appium/java_client/android/HasAndroidSettings.java
+++ b/src/main/java/io/appium/java_client/android/HasAndroidSettings.java
@@ -16,7 +16,6 @@
 
 package io.appium.java_client.android;
 
-
 import io.appium.java_client.HasSettings;
 import io.appium.java_client.Setting;
 
@@ -37,7 +36,7 @@ default void ignoreUnimportantViews(Boolean compress) {
     }
 
     /**
-     * invoke {@code setWaitForIdleTimeout} in {@code com.android.uiautomator.core.Configurator}
+     * invoke {@code setWaitForIdleTimeout} in {@code com.android.uiautomator.core.Configurator}.
      *
      * @param timeout A negative value would reset to its default value. Minimum time unit
      *                resolution is one millisecond
@@ -47,7 +46,7 @@ default void configuratorSetWaitForIdleTimeout(Duration timeout) {
     }
 
     /**
-     * invoke {@code setWaitForSelectorTimeout} in {@code com.android.uiautomator.core.Configurator}
+     * invoke {@code setWaitForSelectorTimeout} in {@code com.android.uiautomator.core.Configurator}.
      *
      * @param timeout A negative value would reset to its default value. Minimum time unit
      *                resolution is one millisecond
@@ -57,7 +56,7 @@ default void configuratorSetWaitForSelectorTimeout(Duration timeout) {
     }
 
     /**
-     * invoke {@code setScrollAcknowledgmentTimeout} in {@code com.android.uiautomator.core.Configurator}
+     * invoke {@code setScrollAcknowledgmentTimeout} in {@code com.android.uiautomator.core.Configurator}.
      *
      * @param timeout A negative value would reset to its default value. Minimum time unit
      *                resolution is one millisecond
@@ -67,7 +66,7 @@ default void configuratorSetScrollAcknowledgmentTimeout(Duration timeout) {
     }
 
     /**
-     * invoke {@code configuratorSetKeyInjectionDelay} in {@code com.android.uiautomator.core.Configurator}
+     * invoke {@code configuratorSetKeyInjectionDelay} in {@code com.android.uiautomator.core.Configurator}.
      *
      * @param delay A negative value would reset to its default value. Minimum time unit
      *              resolution is one millisecond
@@ -77,7 +76,7 @@ default void configuratorSetKeyInjectionDelay(Duration delay) {
     }
 
     /**
-     * invoke {@code setActionAcknowledgmentTimeout} in {@code com.android.uiautomator.core.Configurator}
+     * invoke {@code setActionAcknowledgmentTimeout} in {@code com.android.uiautomator.core.Configurator}.
      *
      * @param timeout A negative value would reset to its default value. Minimum time unit
      *                resolution is one millisecond
diff --git a/src/main/java/io/appium/java_client/events/EventFiringObjectFactory.java b/src/main/java/io/appium/java_client/events/EventFiringObjectFactory.java
index a191680a3..7708ef982 100644
--- a/src/main/java/io/appium/java_client/events/EventFiringObjectFactory.java
+++ b/src/main/java/io/appium/java_client/events/EventFiringObjectFactory.java
@@ -1,6 +1,5 @@
 package io.appium.java_client.events;
 
-
 import io.appium.java_client.events.api.Listener;
 import org.openqa.selenium.WebDriver;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -16,7 +15,7 @@
 public class EventFiringObjectFactory {
 
     /**
-     * This method makes an event firing object
+     * This method makes an event firing object.
      *
      * @param t an original {@link Object} that is
      *               supposed to be listenable
@@ -44,7 +43,7 @@ public static <T> T getEventFiringObject(T t, WebDriver driver, Collection<Liste
     }
 
     /**
-     * This method makes an event firing object
+     * This method makes an event firing object.
      *
      * @param t an original {@link Object} that is
      *               supposed to be listenable
@@ -57,7 +56,7 @@ public static <T> T getEventFiringObject(T t, WebDriver driver) {
     }
 
     /**
-     * This method makes an event firing object
+     * This method makes an event firing object.
      *
      * @param t an original {@link Object} that is
      *               supposed to be listenable
diff --git a/src/main/java/io/appium/java_client/events/EventFiringWebDriverFactory.java b/src/main/java/io/appium/java_client/events/EventFiringWebDriverFactory.java
index d0fb36cd8..7b53dc346 100644
--- a/src/main/java/io/appium/java_client/events/EventFiringWebDriverFactory.java
+++ b/src/main/java/io/appium/java_client/events/EventFiringWebDriverFactory.java
@@ -26,7 +26,7 @@
 public class EventFiringWebDriverFactory {
 
     /**
-     * This method makes an event firing instance of {@link org.openqa.selenium.WebDriver}
+     * This method makes an event firing instance of {@link org.openqa.selenium.WebDriver}.
      *
      * @param driver an original instance of {@link org.openqa.selenium.WebDriver} that is
      *               supposed to be listenable
@@ -38,7 +38,7 @@ public static <T extends WebDriver> T getEventFiringWebDriver(T driver) {
     }
 
     /**
-     * This method makes an event firing instance of {@link org.openqa.selenium.WebDriver}
+     * This method makes an event firing instance of {@link org.openqa.selenium.WebDriver}.
      *
      * @param driver an original instance of {@link org.openqa.selenium.WebDriver} that is
      *               supposed to be listenable
@@ -52,7 +52,7 @@ public static <T extends WebDriver> T getEventFiringWebDriver(T driver, Listener
     }
 
     /**
-     * This method makes an event firing instance of {@link org.openqa.selenium.WebDriver}
+     * This method makes an event firing instance of {@link org.openqa.selenium.WebDriver}.
      *
      * @param driver an original instance of {@link org.openqa.selenium.WebDriver} that is
      *               supposed to be listenable
diff --git a/src/main/java/io/appium/java_client/events/api/general/AlertEventListener.java b/src/main/java/io/appium/java_client/events/api/general/AlertEventListener.java
index 723b9f12a..2a96d1792 100644
--- a/src/main/java/io/appium/java_client/events/api/general/AlertEventListener.java
+++ b/src/main/java/io/appium/java_client/events/api/general/AlertEventListener.java
@@ -23,53 +23,51 @@
 public interface AlertEventListener extends Listener {
 
     /**
-     * This action will be performed each time before {@link org.openqa.selenium.Alert#accept()}
+     * This action will be performed each time before {@link Alert#accept()}.
      *
      * @param driver WebDriver
-     * @param alert {@link org.openqa.selenium.Alert} which is being accepted
+     * @param alert {@link Alert} which is being accepted
      */
     void beforeAlertAccept(WebDriver driver, Alert alert);
 
     /**
-     * This action will be performed each time after {@link Alert#accept()}
+     * This action will be performed each time after {@link Alert#accept()}.
      *
      * @param driver WebDriver
-     * @param alert {@link org.openqa.selenium.Alert} which has been accepted
+     * @param alert {@link Alert} which has been accepted
      */
     void afterAlertAccept(WebDriver driver, Alert alert);
 
     /**
-     * This action will be performed each time before {@link Alert#dismiss()}
+     * This action will be performed each time before {@link Alert#dismiss()}.
      *
      * @param driver WebDriver
-     * @param alert {@link org.openqa.selenium.Alert} which which is being dismissed
+     * @param alert {@link Alert} which which is being dismissed
      */
     void afterAlertDismiss(WebDriver driver, Alert alert);
 
     /**
-     * This action will be performed each time after {@link Alert#dismiss()}
+     * This action will be performed each time after {@link Alert#dismiss()}.
      *
      * @param driver WebDriver
-     * @param alert {@link org.openqa.selenium.Alert} which has been dismissed
+     * @param alert {@link Alert} which has been dismissed
      */
     void beforeAlertDismiss(WebDriver driver, Alert alert);
 
     /**
-     * This action will be performed each time before
-     * {@link org.openqa.selenium.Alert#sendKeys(String)}
+     * This action will be performed each time before {@link Alert#sendKeys(String)}.
      *
      * @param driver WebDriver
-     * @param alert {@link org.openqa.selenium.Alert} which is receiving keys
+     * @param alert {@link Alert} which is receiving keys
      * @param keys Keys which are being sent
      */
     void beforeAlertSendKeys(WebDriver driver, Alert alert, String keys);
 
     /**
-     * This action will be performed each time after
-     * {@link org.openqa.selenium.Alert#sendKeys(String)}
+     * This action will be performed each time after {@link Alert#sendKeys(String)}.
      *
      * @param driver WebDriver
-     * @param alert {@link org.openqa.selenium.Alert} which has received keys
+     * @param alert {@link Alert} which has received keys
      * @param keys Keys which have been sent
      */
     void afterAlertSendKeys(WebDriver driver, Alert alert, String keys);
diff --git a/src/main/java/io/appium/java_client/events/api/general/ElementEventListener.java b/src/main/java/io/appium/java_client/events/api/general/ElementEventListener.java
index 960d7f5b6..e5969e24f 100644
--- a/src/main/java/io/appium/java_client/events/api/general/ElementEventListener.java
+++ b/src/main/java/io/appium/java_client/events/api/general/ElementEventListener.java
@@ -22,7 +22,7 @@
 
 public interface ElementEventListener extends Listener {
     /**
-     * Called before {@link org.openqa.selenium.WebElement#click WebElement.click()}.
+     * Called before {@link WebElement#click WebElement.click()}.
      *
      * @param driver WebDriver
      * @param element the WebElement being used for the action
@@ -30,7 +30,7 @@ public interface ElementEventListener extends Listener {
     void beforeClickOn(WebElement element, WebDriver driver);
 
     /**
-     * Called after {@link org.openqa.selenium.WebElement#click WebElement.click()}.
+     * Called after {@link WebElement#click WebElement.click()}.
      * Not called, if an exception is thrown.
      *
      * @param driver WebDriver
@@ -39,8 +39,8 @@ public interface ElementEventListener extends Listener {
     void afterClickOn(WebElement element, WebDriver driver);
 
     /**
-     * Called before {@link org.openqa.selenium.WebElement#clear WebElement.clear()},
-     * {@link org.openqa.selenium.WebElement#sendKeys WebElement.sendKeys(...)}.
+     * Called before {@link WebElement#clear WebElement.clear()},
+     * {@link WebElement#sendKeys WebElement.sendKeys(...)}.
      *
      * @param driver WebDriver
      * @param element the WebElement being used for the action
@@ -48,17 +48,18 @@ public interface ElementEventListener extends Listener {
     void beforeChangeValueOf(WebElement element, WebDriver driver);
 
     /**
-     * Called before {@link org.openqa.selenium.WebElement#clear WebElement.clear()},
-     * {@link org.openqa.selenium.WebElement#sendKeys WebElement.sendKeys(...)}.
+     * Called before {@link WebElement#clear WebElement.clear()},
+     * {@link WebElement#sendKeys WebElement.sendKeys(...)}.
      *
      * @param driver WebDriver
      * @param element the WebElement being used for the action
+     * @param keysToSend character sequence to send to the element
      */
     void beforeChangeValueOf(WebElement element, WebDriver driver, CharSequence[] keysToSend);
 
     /**
-     * Called after {@link org.openqa.selenium.WebElement#clear WebElement.clear()},
-     * {@link org.openqa.selenium.WebElement#sendKeys WebElement.sendKeys(...)} .
+     * Called after {@link WebElement#clear WebElement.clear()},
+     * {@link WebElement#sendKeys WebElement.sendKeys(...)}.
      * Not called, if an exception is thrown.
      *
      * @param driver WebDriver
@@ -67,12 +68,13 @@ public interface ElementEventListener extends Listener {
     void afterChangeValueOf(WebElement element, WebDriver driver);
 
     /**
-     * Called after {@link org.openqa.selenium.WebElement#clear WebElement.clear()},
-     * {@link org.openqa.selenium.WebElement#sendKeys WebElement.sendKeys(...)} .
+     * Called after {@link WebElement#clear WebElement.clear()},
+     * {@link WebElement#sendKeys WebElement.sendKeys(...)} .
      * Not called, if an exception is thrown.
      *
      * @param driver WebDriver
      * @param element the WebElement being used for the action
+     * @param keysToSend character sequence to send to the element
      */
     void afterChangeValueOf(WebElement element, WebDriver driver, CharSequence[] keysToSend);
-}
\ No newline at end of file
+}
diff --git a/src/main/java/io/appium/java_client/events/api/general/JavaScriptEventListener.java b/src/main/java/io/appium/java_client/events/api/general/JavaScriptEventListener.java
index 4edaaf708..f7addb68e 100644
--- a/src/main/java/io/appium/java_client/events/api/general/JavaScriptEventListener.java
+++ b/src/main/java/io/appium/java_client/events/api/general/JavaScriptEventListener.java
@@ -22,8 +22,7 @@
 public interface JavaScriptEventListener extends Listener {
     /**
      * Called before
-     * {@link org.openqa.selenium.JavascriptExecutor#executeScript(java.lang.String,
-     * java.lang.Object[]) }
+     * {@link org.openqa.selenium.JavascriptExecutor#executeScript(String, Object[]) }.
      *
      * @param driver WebDriver
      * @param script the script to be executed
@@ -32,8 +31,7 @@ public interface JavaScriptEventListener extends Listener {
 
     /**
      * Called after
-     * {@link org.openqa.selenium.remote.RemoteWebDriver#executeScript(java.lang.String,
-     * java.lang.Object[]) }.
+     * {@link org.openqa.selenium.remote.RemoteWebDriver#executeScript(String, Object[]) }.
      * Not called if an exception is thrown
      *
      * @param driver WebDriver
diff --git a/src/main/java/io/appium/java_client/events/api/general/WindowEventListener.java b/src/main/java/io/appium/java_client/events/api/general/WindowEventListener.java
index b9ab08fbc..28c4e9160 100644
--- a/src/main/java/io/appium/java_client/events/api/general/WindowEventListener.java
+++ b/src/main/java/io/appium/java_client/events/api/general/WindowEventListener.java
@@ -23,8 +23,7 @@
 
 public interface WindowEventListener extends Listener {
     /**
-     * This action will be performed each time before
-     * {@link org.openqa.selenium.WebDriver.Window#setSize(Dimension)}
+     * This action will be performed each time before {@link WebDriver.Window#setSize(Dimension)}.
      *
      * @param driver WebDriver
      * @param window is the window whose size is going to be changed
@@ -34,8 +33,7 @@ void beforeWindowChangeSize(WebDriver driver, WebDriver.Window window,
         Dimension targetSize);
 
     /**
-     * This action will be performed each time after
-     * {@link WebDriver.Window#setSize(Dimension)}
+     * This action will be performed each time after {@link WebDriver.Window#setSize(Dimension)}.
      *
      * @param driver WebDriver
      * @param window is the window whose size has been changed
@@ -45,8 +43,7 @@ void afterWindowChangeSize(WebDriver driver, WebDriver.Window window,
         Dimension targetSize);
 
     /**
-     * This action will be performed each time before
-     * {@link WebDriver.Window#setPosition(org.openqa.selenium.Point)}
+     * This action will be performed each time before {@link WebDriver.Window#setPosition(Point)}.
      *
      * @param driver WebDriver
      * @param window is the window whose position is going to be changed
@@ -56,8 +53,7 @@ void beforeWindowIsMoved(WebDriver driver, WebDriver.Window window,
         Point targetPoint);
 
     /**
-     * This action will be performed each time after
-     * {@link WebDriver.Window#setPosition(org.openqa.selenium.Point)}
+     * This action will be performed each time after {@link WebDriver.Window#setPosition(Point)}.
      *
      * @param driver WebDriver
      * @param window is the window whose position has been changed
@@ -68,8 +64,7 @@ void afterWindowIsMoved(WebDriver driver, WebDriver.Window window,
 
 
     /**
-     * This action will be performed each time before
-     * {@link WebDriver.Window#maximize()}
+     * This action will be performed each time before {@link WebDriver.Window#maximize()}.
      *
      * @param driver WebDriver
      * @param window is the window which is going to be maximized
@@ -77,8 +72,7 @@ void afterWindowIsMoved(WebDriver driver, WebDriver.Window window,
     void beforeWindowIsMaximized(WebDriver driver, WebDriver.Window window);
 
     /**
-     * This action will be performed each time after
-     * {@link WebDriver.Window#maximize()}
+     * This action will be performed each time after {@link WebDriver.Window#maximize()}.
      *
      * @param driver WebDriver
      * @param window is the window which has been maximized
diff --git a/src/main/java/io/appium/java_client/internal/ElementMap.java b/src/main/java/io/appium/java_client/internal/ElementMap.java
index 65ff376e8..44c852e77 100644
--- a/src/main/java/io/appium/java_client/internal/ElementMap.java
+++ b/src/main/java/io/appium/java_client/internal/ElementMap.java
@@ -69,10 +69,11 @@ public Class<? extends RemoteWebElement> getElementClass() {
     }
 
     /**
+     * Gets element class by {@code platform} and mobile {@code automation} type.
+     *
      * @param platform is the mobile platform. See {@link MobilePlatform}.
      * @param automation is the mobile automation type. See {@link AutomationName}
-     * @return subclass of {@link org.openqa.selenium.remote.RemoteWebElement} that convenient
-     *     to current session details.
+     * @return subclass of {@link RemoteWebElement} that convenient to current session details.
      */
     public static Class<? extends RemoteWebElement> getElementClass(String platform, String automation) {
         if (isBlank(platform) && isBlank(automation)) {
diff --git a/src/main/java/io/appium/java_client/internal/JsonToMobileElementConverter.java b/src/main/java/io/appium/java_client/internal/JsonToMobileElementConverter.java
index 5d752f64a..180470773 100644
--- a/src/main/java/io/appium/java_client/internal/JsonToMobileElementConverter.java
+++ b/src/main/java/io/appium/java_client/internal/JsonToMobileElementConverter.java
@@ -41,9 +41,10 @@ public class JsonToMobileElementConverter extends JsonToWebElementConverter {
     private final String platform;
     private final String automation;
 
-
     /**
-     * @param driver an instance of {@link org.openqa.selenium.remote.RemoteWebDriver} subclass
+     * Creates a new instance based on {@code driver} and object with session details.
+     *
+     * @param driver an instance of {@link RemoteWebDriver} subclass
      * @param hasSessionDetails object that has session details
      */
     public JsonToMobileElementConverter(RemoteWebDriver driver, HasSessionDetails hasSessionDetails) {
diff --git a/src/main/java/io/appium/java_client/ios/HasIOSSettings.java b/src/main/java/io/appium/java_client/ios/HasIOSSettings.java
index f6050923a..7a44fd12e 100644
--- a/src/main/java/io/appium/java_client/ios/HasIOSSettings.java
+++ b/src/main/java/io/appium/java_client/ios/HasIOSSettings.java
@@ -16,7 +16,6 @@
 
 package io.appium.java_client.ios;
 
-
 import io.appium.java_client.HasSettings;
 import io.appium.java_client.Setting;
 
diff --git a/src/main/java/io/appium/java_client/ios/IOSDriver.java b/src/main/java/io/appium/java_client/ios/IOSDriver.java
index ba5eb4fdf..d39f7baff 100644
--- a/src/main/java/io/appium/java_client/ios/IOSDriver.java
+++ b/src/main/java/io/appium/java_client/ios/IOSDriver.java
@@ -39,6 +39,8 @@
 import java.time.Duration;
 
 /**
+ * iOS driver implementation.
+ *
  * @param <T> the required type of class which implement
  *           {@link org.openqa.selenium.WebElement}.
  *           Instances of the defined type will be returned via findElement* and findElements*.
@@ -57,33 +59,33 @@ public class IOSDriver<T extends WebElement>
     private static final String IOS_PLATFORM = MobilePlatform.IOS;
 
     /**
-     * @param executor is an instance of {@link org.openqa.selenium.remote.HttpCommandExecutor}
+     * Creates a new instance based on command {@code executor} and {@code capabilities}.
+     *
+     * @param executor is an instance of {@link HttpCommandExecutor}
      *                 or class that extends it. Default commands or another vendor-specific
      *                 commands may be specified there.
-     * @param capabilities take a look
-     *                     at {@link org.openqa.selenium.Capabilities}
+     * @param capabilities take a look at {@link Capabilities}
      */
     public IOSDriver(HttpCommandExecutor executor, Capabilities capabilities) {
         super(executor, substituteMobilePlatform(capabilities, IOS_PLATFORM));
     }
 
     /**
-     * @param remoteAddress is the address
-     *                      of remotely/locally started Appium server
-     * @param desiredCapabilities take a look
-     *                            at {@link org.openqa.selenium.Capabilities}
+     * Creates a new instance based on Appium server URL and {@code capabilities}.
+     *
+     * @param remoteAddress is the address of remotely/locally started Appium server
+     * @param desiredCapabilities take a look at {@link Capabilities}
      */
     public IOSDriver(URL remoteAddress, Capabilities desiredCapabilities) {
         super(remoteAddress, substituteMobilePlatform(desiredCapabilities, IOS_PLATFORM));
     }
 
     /**
-     * @param remoteAddress is the address
-     *                      of remotely/locally started Appium server
-     * @param httpClientFactory take a look
-     *                          at {@link org.openqa.selenium.remote.http.HttpClient.Factory}
-     * @param desiredCapabilities take a look
-     *                            at {@link org.openqa.selenium.Capabilities}
+     * Creates a new instance based on Appium server URL, HTTP client factory and {@code capabilities}.
+     *
+     * @param remoteAddress is the address of remotely/locally started Appium server
+     * @param httpClientFactory take a look at {@link HttpClient.Factory}
+     * @param desiredCapabilities take a look at {@link Capabilities}
      */
     public IOSDriver(URL remoteAddress, HttpClient.Factory httpClientFactory,
         Capabilities desiredCapabilities) {
@@ -92,22 +94,21 @@ public IOSDriver(URL remoteAddress, HttpClient.Factory httpClientFactory,
     }
 
     /**
-     * @param service take a look
-     *                at {@link io.appium.java_client.service.local.AppiumDriverLocalService}
-     * @param desiredCapabilities take a look
-     *                            at {@link org.openqa.selenium.Capabilities}
+     * Creates a new instance based on Appium driver local service and {@code capabilities}.
+     *
+     * @param service take a look at {@link AppiumDriverLocalService}
+     * @param desiredCapabilities take a look at {@link Capabilities}
      */
     public IOSDriver(AppiumDriverLocalService service, Capabilities desiredCapabilities) {
         super(service, substituteMobilePlatform(desiredCapabilities, IOS_PLATFORM));
     }
 
     /**
-     * @param service take a look
-     *                at {@link io.appium.java_client.service.local.AppiumDriverLocalService}
-     * @param httpClientFactory take a look
-     *                          at {@link org.openqa.selenium.remote.http.HttpClient.Factory}
-     * @param desiredCapabilities take a look
-     *                            at {@link org.openqa.selenium.Capabilities}
+     * Creates a new instance based on Appium driver local service, HTTP client factory and {@code capabilities}.
+     *
+     * @param service take a look at {@link AppiumDriverLocalService}
+     * @param httpClientFactory take a look at {@link HttpClient.Factory}
+     * @param desiredCapabilities take a look at {@link Capabilities}
      */
     public IOSDriver(AppiumDriverLocalService service, HttpClient.Factory httpClientFactory,
         Capabilities desiredCapabilities) {
@@ -116,22 +117,21 @@ public IOSDriver(AppiumDriverLocalService service, HttpClient.Factory httpClient
     }
 
     /**
-     * @param builder take a look
-     *                at {@link io.appium.java_client.service.local.AppiumServiceBuilder}
-     * @param desiredCapabilities take a look
-     *                            at {@link org.openqa.selenium.Capabilities}
+     * Creates a new instance based on Appium service builder and {@code capabilities}.
+     *
+     * @param builder take a look at {@link AppiumServiceBuilder}
+     * @param desiredCapabilities take a look at {@link Capabilities}
      */
     public IOSDriver(AppiumServiceBuilder builder, Capabilities desiredCapabilities) {
         super(builder, substituteMobilePlatform(desiredCapabilities, IOS_PLATFORM));
     }
 
     /**
-     * @param builder take a look
-     *                at {@link io.appium.java_client.service.local.AppiumServiceBuilder}
-     * @param httpClientFactory take a look
-     *                          at {@link org.openqa.selenium.remote.http.HttpClient.Factory}
-     * @param desiredCapabilities take a look
-     *                            at {@link org.openqa.selenium.Capabilities}
+     * Creates a new instance based on Appium service builder, HTTP client factory and {@code capabilities}.
+     *
+     * @param builder take a look at {@link AppiumServiceBuilder}
+     * @param httpClientFactory take a look at {@link HttpClient.Factory}
+     * @param desiredCapabilities take a look at {@link Capabilities}
      */
     public IOSDriver(AppiumServiceBuilder builder, HttpClient.Factory httpClientFactory,
         Capabilities desiredCapabilities) {
@@ -140,18 +140,19 @@ public IOSDriver(AppiumServiceBuilder builder, HttpClient.Factory httpClientFact
     }
 
     /**
-     * @param httpClientFactory take a look
-     *                          at {@link org.openqa.selenium.remote.http.HttpClient.Factory}
-     * @param desiredCapabilities take a look
-     *                            at {@link org.openqa.selenium.Capabilities}
+     * Creates a new instance based on HTTP client factory and {@code capabilities}.
+     *
+     * @param httpClientFactory take a look at {@link HttpClient.Factory}
+     * @param desiredCapabilities take a look at {@link Capabilities}
      */
     public IOSDriver(HttpClient.Factory httpClientFactory, Capabilities desiredCapabilities) {
         super(httpClientFactory, substituteMobilePlatform(desiredCapabilities, IOS_PLATFORM));
     }
 
     /**
-     * @param desiredCapabilities take a look
-     *                            at {@link org.openqa.selenium.Capabilities}
+     * Creates a new instance based on {@code capabilities}.
+     *
+     * @param desiredCapabilities take a look at {@link Capabilities}
      */
     public IOSDriver(Capabilities desiredCapabilities) {
         super(substituteMobilePlatform(desiredCapabilities, IOS_PLATFORM));
@@ -159,7 +160,7 @@ public IOSDriver(Capabilities desiredCapabilities) {
 
     /**
      * Runs the current app as a background app for the number of seconds
-     * or minimizes the app
+     * or minimizes the app.
      *
      * @param duration The time to run App in background.
      */
diff --git a/src/main/java/io/appium/java_client/ios/IOSMobileCommandHelper.java b/src/main/java/io/appium/java_client/ios/IOSMobileCommandHelper.java
index 1a63c3a40..a9bc0fe3b 100644
--- a/src/main/java/io/appium/java_client/ios/IOSMobileCommandHelper.java
+++ b/src/main/java/io/appium/java_client/ios/IOSMobileCommandHelper.java
@@ -26,11 +26,9 @@
 public class IOSMobileCommandHelper extends MobileCommand {
 
     /**
-     * This method forms a {@link java.util.Map} of parameters for the
-     * device shaking.
+     * This method forms a {@link Map} of parameters for the device shaking.
      *
-     * @return a key-value pair. The key is the command name. The value is a
-     * {@link java.util.Map} command arguments.
+     * @return a key-value pair. The key is the command name. The value is a {@link Map} command arguments.
      */
     public static Map.Entry<String, Map<String, ?>>  shakeCommand() {
         return new AbstractMap.SimpleEntry<>(
@@ -38,10 +36,10 @@ public class IOSMobileCommandHelper extends MobileCommand {
     }
     
     /**
-     * This method forms a {@link java.util.Map} of parameters for the touchId simulator.
+     * This method forms a {@link Map} of parameters for the touchId simulator.
      * 
      * @param match If true, simulates a successful fingerprint scan. If false, simulates a failed fingerprint scan.
-     * 
+     * @return a key-value pair. The key is the command name. The value is a {@link Map} command arguments.
      */
     public static Map.Entry<String, Map<String, ?>> touchIdCommand(boolean match) {
         return new AbstractMap.SimpleEntry<>(
@@ -49,9 +47,11 @@ public class IOSMobileCommandHelper extends MobileCommand {
     }
 
     /**
-     * This method forms a {@link java.util.Map} of parameters for the toggling touchId
+     * This method forms a {@link Map} of parameters for the toggling touchId
      * enrollment in simulator.
-     * The method is deprecated. Please use {@link #toggleTouchIdEnrollmentCommand(boolean)} instead.
+     * @deprecated Please use {@link #toggleTouchIdEnrollmentCommand(boolean)} instead.
+     *
+     * @return a key-value pair. The key is the command name. The value is a {@link Map} command arguments.
      */
     @Deprecated
     public static Map.Entry<String, Map<String, ?>> toggleTouchIdEnrollmentCommand() {
@@ -60,11 +60,11 @@ public class IOSMobileCommandHelper extends MobileCommand {
     }
 
     /**
-     * This method forms a {@link java.util.Map} of parameters for the toggling touchId
+     * This method forms a {@link Map} of parameters for the toggling touchId
      * enrollment in simulator.
      *
      * @param enabled Whether to enable or disable Touch ID Enrollment for Simulator.
-     *
+     * @return a key-value pair. The key is the command name. The value is a {@link Map} command arguments.
      */
     public static Map.Entry<String, Map<String, ?>> toggleTouchIdEnrollmentCommand(boolean enabled) {
         return new AbstractMap.SimpleEntry<>(
diff --git a/src/main/java/io/appium/java_client/ios/PerformsTouchID.java b/src/main/java/io/appium/java_client/ios/PerformsTouchID.java
index e1405c22a..2fcd8631e 100644
--- a/src/main/java/io/appium/java_client/ios/PerformsTouchID.java
+++ b/src/main/java/io/appium/java_client/ios/PerformsTouchID.java
@@ -25,7 +25,7 @@
 public interface PerformsTouchID extends ExecutesMethod {
 
     /**
-     * Simulate touchId event
+     * Simulate touchId event.
      *
      * @param match If true, simulates a successful fingerprint scan. If false, simulates a failed fingerprint scan.
      */
diff --git a/src/main/java/io/appium/java_client/pagefactory/AndroidBy.java b/src/main/java/io/appium/java_client/pagefactory/AndroidBy.java
index b802cbbbc..298956fd7 100644
--- a/src/main/java/io/appium/java_client/pagefactory/AndroidBy.java
+++ b/src/main/java/io/appium/java_client/pagefactory/AndroidBy.java
@@ -21,9 +21,11 @@
  */
 public @interface AndroidBy {
     /**
-     * It is an is Android UIAutomator string.
+     * It is an Android UIAutomator string.
      * Read http://developer.android.com/intl/ru/tools/testing-support-library/
      * index.html#uia-apis
+     *
+     * @return an Android UIAutomator string
      */
     String uiAutomator() default "";
 
@@ -31,31 +33,43 @@
      * It an UI automation accessibility Id which is a convenient to Android.
      * About Android accessibility
      * https://developer.android.com/intl/ru/training/accessibility/accessible-app.html
+     *
+     * @return an UI automation accessibility Id
      */
     String accessibility() default "";
 
     /**
      * It is an id of the target element.
+     *
+     * @return an id of the target element
      */
     String id() default "";
 
     /**
      * It is a className of the target element.
+     *
+     * @return a className of the target element
      */
     String className() default "";
 
     /**
      * It is a desired element tag.
+     *
+     * @return a desired element tag
      */
     String tagName() default "";
 
     /**
      * It is a xpath to the target element.
+     *
+     * @return a xpath to the target element
      */
     String xpath() default "";
 
     /**
-     * @return priority of the searching. Higher number means lower priority.
+     * Priority of the searching. Higher number means lower priority.
+     *
+     * @return priority of the searching
      */
     int priority() default 0;
 }
diff --git a/src/main/java/io/appium/java_client/pagefactory/AndroidFindAll.java b/src/main/java/io/appium/java_client/pagefactory/AndroidFindAll.java
index 1f411a4a5..69fe8c1e0 100644
--- a/src/main/java/io/appium/java_client/pagefactory/AndroidFindAll.java
+++ b/src/main/java/io/appium/java_client/pagefactory/AndroidFindAll.java
@@ -26,7 +26,7 @@
 
 /**
  * Used to mark a field on a Page/Screen Object to indicate that lookup should use a
- * series of {@link io.appium.java_client.pagefactory.AndroidBy} tags
+ * series of {@link AndroidBy} tags
  * It will then search for all elements that match any criteria. Note that elements
  * are not guaranteed to be in document order.
  */
@@ -34,13 +34,16 @@
 @Repeatable(AndroidFindByAllSet.class)
 public @interface AndroidFindAll {
     /**
-     * It is a set of {@link io.appium.java_client.pagefactory.AndroidBy} strategies which may
-     * be used to find the target element.
+     * It is a set of {@link AndroidBy} strategies which may be used to find the target element.
+     *
+     * @return a collection of strategies which may be used to find the target element
      */
     AndroidBy[] value();
 
     /**
-     * @return priority of the searching. Higher number means lower priority.
+     * Priority of the searching. Higher number means lower priority.
+     *
+     * @return priority of the searching
      */
     int priority() default 0;
 }
diff --git a/src/main/java/io/appium/java_client/pagefactory/AndroidFindBy.java b/src/main/java/io/appium/java_client/pagefactory/AndroidFindBy.java
index bb17d861b..c15226ec2 100644
--- a/src/main/java/io/appium/java_client/pagefactory/AndroidFindBy.java
+++ b/src/main/java/io/appium/java_client/pagefactory/AndroidFindBy.java
@@ -36,9 +36,11 @@
 @Repeatable(AndroidFindBySet.class)
 public @interface AndroidFindBy {
     /**
-     * It is an is Android UIAutomator string.
+     * It is an Android UIAutomator string.
      * Read http://developer.android.com/intl/ru/tools/testing-support-library/
      * index.html#uia-apis
+     *
+     * @return an Android UIAutomator string
      */
     String uiAutomator() default "";
 
@@ -46,31 +48,43 @@
      * It an UI automation accessibility Id which is a convenient to Android.
      * About Android accessibility
      * https://developer.android.com/intl/ru/training/accessibility/accessible-app.html
+     *
+     * @return an UI automation accessibility Id
      */
     String accessibility() default "";
 
     /**
      * It is an id of the target element.
+     *
+     * @return an id of the target element
      */
     String id() default "";
 
     /**
      * It is a className of the target element.
+     *
+     * @return a className of the target element
      */
     String className() default "";
 
     /**
      * It is a desired element tag.
+     *
+     * @return a desired element tag
      */
     String tagName() default "";
 
     /**
      * It is a xpath to the target element.
+     *
+     * @return a xpath to the target element
      */
     String xpath() default "";
 
     /**
-     * @return priority of the searching. Higher number means lower priority.
+     * Priority of the searching. Higher number means lower priority.
+     *
+     * @return priority of the searching
      */
     int priority() default 0;
 }
diff --git a/src/main/java/io/appium/java_client/pagefactory/AndroidFindBys.java b/src/main/java/io/appium/java_client/pagefactory/AndroidFindBys.java
index e8c0d2ae1..eabfeb7c2 100644
--- a/src/main/java/io/appium/java_client/pagefactory/AndroidFindBys.java
+++ b/src/main/java/io/appium/java_client/pagefactory/AndroidFindBys.java
@@ -34,11 +34,15 @@
     /**
      * It is a set of {@link io.appium.java_client.pagefactory.AndroidBy} strategies which build
      * the chain of the searching for the target element.
+     *
+     * @return a collection of strategies which build the chain of the searching for the target element
      */
     AndroidBy[] value();
 
     /**
-     * @return priority of the searching. Higher number means lower priority.
+     * Priority of the searching. Higher number means lower priority.
+     *
+     * @return priority of the searching
      */
     int priority() default 0;
 }
diff --git a/src/main/java/io/appium/java_client/pagefactory/AppiumElementLocator.java b/src/main/java/io/appium/java_client/pagefactory/AppiumElementLocator.java
index a7acc71ae..cef9a3e77 100644
--- a/src/main/java/io/appium/java_client/pagefactory/AppiumElementLocator.java
+++ b/src/main/java/io/appium/java_client/pagefactory/AppiumElementLocator.java
@@ -22,7 +22,6 @@
 import static io.appium.java_client.pagefactory.utils.WebDriverUnpackUtility.getCurrentContentType;
 import static java.lang.String.format;
 
-
 import io.appium.java_client.pagefactory.bys.ContentMappedBy;
 import io.appium.java_client.pagefactory.locator.CacheableLocator;
 
diff --git a/src/main/java/io/appium/java_client/pagefactory/AppiumFieldDecorator.java b/src/main/java/io/appium/java_client/pagefactory/AppiumFieldDecorator.java
index 9d189d315..4e6f40821 100644
--- a/src/main/java/io/appium/java_client/pagefactory/AppiumFieldDecorator.java
+++ b/src/main/java/io/appium/java_client/pagefactory/AppiumFieldDecorator.java
@@ -18,8 +18,7 @@
 
 import static io.appium.java_client.internal.ElementMap.getElementClass;
 import static io.appium.java_client.pagefactory.utils.ProxyFactory.getEnhancedProxy;
-import static io.appium.java_client.pagefactory.utils.WebDriverUnpackUtility
-    .unpackWebDriverFromSearchContext;
+import static io.appium.java_client.pagefactory.utils.WebDriverUnpackUtility.unpackWebDriverFromSearchContext;
 import static java.util.Optional.ofNullable;
 
 import com.google.common.collect.ImmutableList;
@@ -79,11 +78,11 @@ public AppiumFieldDecorator(SearchContext context, long timeout,
     }
 
     /**
-     * @param context is an instance of {@link org.openqa.selenium.SearchContext}
-     *                It may be the instance of {@link org.openqa.selenium.WebDriver}
-     *                or {@link org.openqa.selenium.WebElement} or
-     *                {@link io.appium.java_client.pagefactory.Widget} or some other user's
-     *                extension/implementation.
+     * Creates field decorator based on {@link SearchContext} and timeout {@code duration}.
+     *
+     * @param context is an instance of {@link SearchContext}
+     *                It may be the instance of {@link WebDriver} or {@link WebElement} or
+     *                {@link Widget} or some other user's extension/implementation.
      * @param duration is a desired duration of the waiting for an element presence.
      */
     public AppiumFieldDecorator(SearchContext context, TimeOutDuration duration) {
@@ -151,9 +150,10 @@ public AppiumFieldDecorator(SearchContext context) {
     }
 
     /**
+     * Decorated page object {@code field}.
+     *
      * @param ignored class loader is ignored by current implementation
-     * @param field is {@link java.lang.reflect.Field} of page object which is supposed to be
-     *              decorated.
+     * @param field is {@link Field} of page object which is supposed to be decorated.
      * @return a field value or null.
      */
     public Object decorate(ClassLoader ignored, Field field) {
diff --git a/src/main/java/io/appium/java_client/pagefactory/HowToUseLocators.java b/src/main/java/io/appium/java_client/pagefactory/HowToUseLocators.java
index 5208367b7..a4b65e36c 100644
--- a/src/main/java/io/appium/java_client/pagefactory/HowToUseLocators.java
+++ b/src/main/java/io/appium/java_client/pagefactory/HowToUseLocators.java
@@ -24,37 +24,52 @@
 @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.FIELD, ElementType.TYPE})
 public @interface HowToUseLocators {
     /**
-     * @return the strategy which defines how to use locators which are described by
-     * the {@link AndroidFindBy} annotation. These annotations can define the chained searching
+     * The strategy which defines how to use locators which are described by the
+     * {@link AndroidFindBy} annotation. These annotations can define the chained searching
      * or the searching by all possible locators.
+     *
+     * @return the strategy which defines how to use locators which are described by the
+     * {@link AndroidFindBy} annotation
      */
     LocatorGroupStrategy androidAutomation() default LocatorGroupStrategy.CHAIN;
 
     /**
-     * @return the strategy which defines how to use locators which are described by
-     * the {@link SelendroidFindBy} annotation. These annotations can define the chained searching
+     * The strategy which defines how to use locators which are described by the
+     * {@link SelendroidFindBy} annotation. These annotations can define the chained searching
      * or the searching by all possible locators.
+     *
+     * @return the strategy which defines how to use locators which are described by the
+     * {@link SelendroidFindBy} annotation
      */
     LocatorGroupStrategy selendroidAutomation() default LocatorGroupStrategy.CHAIN;
 
     /**
-     * @return the strategy which defines how to use locators which are described by
-     * the {@link iOSFindBy} annotation. These annotations can define the chained searching
+     * The strategy which defines how to use locators which are described by the
+     * {@link iOSFindBy} annotation. These annotations can define the chained searching
      * or the searching by all possible locators.
+     *
+     * @return the strategy which defines how to use locators which are described by the
+     * {@link iOSFindBy} annotation
      */
     LocatorGroupStrategy iOSAutomation() default LocatorGroupStrategy.CHAIN;
 
     /**
-     * @return the strategy which defines how to use locators which are described by
-     * the {@link WindowsFindBy} annotation. These annotations can define the chained searching
+     * The strategy which defines how to use locators which are described by the
+     * {@link WindowsFindBy} annotation. These annotations can define the chained searching
      * or the searching by all possible locators.
+     *
+     * @return the strategy which defines how to use locators which are described by the
+     * {@link WindowsFindBy} annotation
      */
     LocatorGroupStrategy windowsAutomation() default LocatorGroupStrategy.CHAIN;
 
     /**
-     * @return the strategy which defines how to use locators which are described by
-     * the {@link iOSXCUITFindBy} annotation. These annotations can define the chained searching
+     * The strategy which defines how to use locators which are described by the
+     * {@link iOSXCUITFindBy} annotation. These annotations can define the chained searching
      * or the searching by all possible locators.
+     *
+     * @return the strategy which defines how to use locators which are described by the
+     * {@link iOSXCUITFindBy} annotation
      */
     LocatorGroupStrategy iOSXCUITAutomation() default LocatorGroupStrategy.CHAIN;
 }
diff --git a/src/main/java/io/appium/java_client/pagefactory/SelendroidBy.java b/src/main/java/io/appium/java_client/pagefactory/SelendroidBy.java
index 75933eba4..829b55d49 100644
--- a/src/main/java/io/appium/java_client/pagefactory/SelendroidBy.java
+++ b/src/main/java/io/appium/java_client/pagefactory/SelendroidBy.java
@@ -23,41 +23,57 @@
 public @interface SelendroidBy {
     /**
      * It is an id of the target element.
+     *
+     * @return an id of the target element
      */
     String id() default "";
 
     /**
      * It is used in Selendroid mode instead of accessibility id.
+     *
+     * @return name
      */
     String name() default "";
 
     /**
      * It is a className of the target element.
+     *
+     * @return a className of the target element
      */
     String className() default "";
 
     /**
      * It is a desired element tag.
+     *
+     * @return a desired element tag
      */
     String tagName() default "";
 
     /**
      * It is a xpath to the target element.
+     *
+     * @return a xpath to the target element
      */
     String xpath() default "";
 
     /**
      * It is a text of the desired element.
+     *
+     * @return a text of the desired element
      */
     String linkText() default "";
 
     /**
      * It is a part of the text of the desired element.
+     *
+     * @return a part of the text of the desired element
      */
     String partialLinkText() default "";
 
     /**
-     * @return priority of the searching. Higher number means lower priority.
+     * Priority of the searching. Higher number means lower priority.
+     *
+     * @return priority of the searching
      */
     int priority() default 0;
 }
diff --git a/src/main/java/io/appium/java_client/pagefactory/SelendroidFindAll.java b/src/main/java/io/appium/java_client/pagefactory/SelendroidFindAll.java
index 8e2e56a79..bbbb233d3 100644
--- a/src/main/java/io/appium/java_client/pagefactory/SelendroidFindAll.java
+++ b/src/main/java/io/appium/java_client/pagefactory/SelendroidFindAll.java
@@ -25,20 +25,23 @@
 
 /**
  * Used to mark a field on a Page/Screen Object to indicate that lookup should use a
- * series of {@link io.appium.java_client.pagefactory.SelendroidBy} tags
+ * series of {@link SelendroidBy} tags
  * It will then search for all elements that match any criteria. Note that elements
  * are not guaranteed to be in document order.
  */
 @Retention(RUNTIME) @Target({FIELD, TYPE})
 public @interface SelendroidFindAll {
     /**
-     * It is a set of {@link io.appium.java_client.pagefactory.SelendroidBy} strategies which
-     * may be used to find the target element.
+     * It is a set of {@link SelendroidBy} strategies which may be used to find the target element.
+     *
+     * @return a collection of strategies which may be used to find the target element
      */
     SelendroidBy[] value();
 
     /**
-     * @return priority of the searching. Higher number means lower priority.
+     * Priority of the searching. Higher number means lower priority.
+     *
+     * @return priority of the searching
      */
     int priority() default 0;
 }
diff --git a/src/main/java/io/appium/java_client/pagefactory/SelendroidFindBy.java b/src/main/java/io/appium/java_client/pagefactory/SelendroidFindBy.java
index 146079a14..8bcd75fce 100644
--- a/src/main/java/io/appium/java_client/pagefactory/SelendroidFindBy.java
+++ b/src/main/java/io/appium/java_client/pagefactory/SelendroidFindBy.java
@@ -37,41 +37,57 @@
 public @interface SelendroidFindBy {
     /**
      * It is an id of the target element.
+     *
+     * @return an id of the target element
      */
     String id() default "";
 
     /**
      * It is used in Selendroid mode instead of accessibility id.
+     *
+     * @return name
      */
     String name() default "";
 
     /**
      * It is a className of the target element.
+     *
+     * @return a className of the target element
      */
     String className() default "";
 
     /**
      * It is a desired element tag.
+     *
+     * @return a desired element tag
      */
     String tagName() default "";
 
     /**
      * It is a xpath to the target element.
+     *
+     * @return a xpath to the target element
      */
     String xpath() default "";
 
     /**
      * It is a text of the desired element.
+     *
+     * @return a text of the desired element
      */
     String linkText() default "";
 
     /**
      * It is a part of the text of the desired element.
+     *
+     * @return a part of the text of the desired element
      */
     String partialLinkText() default "";
 
     /**
-     * @return priority of the searching. Higher number means lower priority.
+     * Priority of the searching. Higher number means lower priority.
+     *
+     * @return priority of the searching
      */
     int priority() default 0;
 }
diff --git a/src/main/java/io/appium/java_client/pagefactory/SelendroidFindBys.java b/src/main/java/io/appium/java_client/pagefactory/SelendroidFindBys.java
index 6a7bd2f3a..518235bf4 100644
--- a/src/main/java/io/appium/java_client/pagefactory/SelendroidFindBys.java
+++ b/src/main/java/io/appium/java_client/pagefactory/SelendroidFindBys.java
@@ -25,18 +25,21 @@
 
 /**
  * Used to mark a field on a Page Object to indicate that lookup should
- * use a series of {@link io.appium.java_client.pagefactory.SelendroidBy} tags.
+ * use a series of {@link SelendroidBy} tags.
  */
 @Retention(RUNTIME) @Target({FIELD, TYPE})
 public @interface SelendroidFindBys {
     /**
-     * It is a set of {@link io.appium.java_client.pagefactory.SelendroidBy} strategies which
-     * build the chain of the searching for the target element.
+     * It is a set of {@link SelendroidBy} strategies which build the chain of the searching for the target element.
+     *
+     * @return a collection of strategies which build the chain of the searching for the target element
      */
     SelendroidBy[] value();
 
     /**
-     * @return priority of the searching. Higher number means lower priority.
+     * Priority of the searching. Higher number means lower priority.
+     *
+     * @return priority of the searching
      */
     int priority() default 0;
 }
diff --git a/src/main/java/io/appium/java_client/pagefactory/TimeOutDuration.java b/src/main/java/io/appium/java_client/pagefactory/TimeOutDuration.java
index 73f530451..4ec68861d 100644
--- a/src/main/java/io/appium/java_client/pagefactory/TimeOutDuration.java
+++ b/src/main/java/io/appium/java_client/pagefactory/TimeOutDuration.java
@@ -30,6 +30,8 @@ public class TimeOutDuration {
     private TimeUnit unit;
 
     /**
+     * Creates a new timeout duration from the amount of time and the time unit.
+     *
      * @param time The amount of time.
      * @param unit The unit of time.
      */
diff --git a/src/main/java/io/appium/java_client/pagefactory/Widget.java b/src/main/java/io/appium/java_client/pagefactory/Widget.java
index 6ac55e189..4771272e6 100644
--- a/src/main/java/io/appium/java_client/pagefactory/Widget.java
+++ b/src/main/java/io/appium/java_client/pagefactory/Widget.java
@@ -16,8 +16,7 @@
 
 package io.appium.java_client.pagefactory;
 
-import static io.appium.java_client.pagefactory.utils.WebDriverUnpackUtility
-    .unpackWebDriverFromSearchContext;
+import static io.appium.java_client.pagefactory.utils.WebDriverUnpackUtility.unpackWebDriverFromSearchContext;
 
 import org.openqa.selenium.By;
 import org.openqa.selenium.SearchContext;
diff --git a/src/main/java/io/appium/java_client/pagefactory/WindowsBy.java b/src/main/java/io/appium/java_client/pagefactory/WindowsBy.java
index 892201cc6..e953db2fc 100644
--- a/src/main/java/io/appium/java_client/pagefactory/WindowsBy.java
+++ b/src/main/java/io/appium/java_client/pagefactory/WindowsBy.java
@@ -22,37 +22,51 @@
 public @interface WindowsBy {
 
     /**
-     * It is an is Windows automator string.
+     * It is a Windows automator string.
+     *
+     * @return a Windows automator string
      */
     String windowsAutomation()  default "";
 
     /**
      * It an UI automation accessibility Id which is a convenient to Windows.
+     *
+     * @return an UI automation accessibility Id
      */
     String accessibility() default "";
 
     /**
      * It is an id of the target element.
+     *
+     * @return an id of the target element
      */
     String id() default "";
 
     /**
      * It is a className of the target element.
+     *
+     * @return a className of the target element
      */
     String className() default "";
 
     /**
      * It is a desired element tag.
+     *
+     * @return a desired element tag
      */
     String tagName() default "";
 
     /**
      * It is a xpath to the target element.
+     *
+     * @return a xpath to the target element
      */
     String xpath() default "";
 
     /**
-     * @return priority of the searching. Higher number means lower priority.
+     * Priority of the searching. Higher number means lower priority.
+     *
+     * @return priority of the searching
      */
     int priority() default 0;
 }
diff --git a/src/main/java/io/appium/java_client/pagefactory/WindowsFindAll.java b/src/main/java/io/appium/java_client/pagefactory/WindowsFindAll.java
index 5b1c7cf00..03be2f654 100644
--- a/src/main/java/io/appium/java_client/pagefactory/WindowsFindAll.java
+++ b/src/main/java/io/appium/java_client/pagefactory/WindowsFindAll.java
@@ -34,13 +34,16 @@
 @Repeatable(WindowsFindByAllSet.class)
 public @interface WindowsFindAll {
     /**
-     * It is a set of {@link WindowsBy} strategies which may be
-     * used to find the target element.
+     * It is a set of {@link WindowsBy} strategies which may be used to find the target element.
+     *
+     * @return a collection of strategies which may be used to find the target element
      */
     WindowsBy[] value();
 
     /**
-     * @return priority of the searching. Higher number means lower priority.
+     * Priority of the searching. Higher number means lower priority.
+     *
+     * @return priority of the searching
      */
     int priority() default 0;
 }
diff --git a/src/main/java/io/appium/java_client/pagefactory/WindowsFindBy.java b/src/main/java/io/appium/java_client/pagefactory/WindowsFindBy.java
index 667814056..9ba86d6c3 100644
--- a/src/main/java/io/appium/java_client/pagefactory/WindowsFindBy.java
+++ b/src/main/java/io/appium/java_client/pagefactory/WindowsFindBy.java
@@ -36,37 +36,51 @@
 public @interface WindowsFindBy {
 
     /**
-     * It is an is Windows automator string.
+     * It is a Windows automator string.
+     *
+     * @return a Windows automator string
      */
     String windowsAutomation()  default "";
 
     /**
      * It an UI automation accessibility Id which is a convenient to Windows.
+     *
+     * @return an UI automation accessibility Id
      */
     String accessibility() default "";
 
     /**
      * It is an id of the target element.
+     *
+     * @return an id of the target element
      */
     String id() default "";
 
     /**
      * It is a className of the target element.
+     *
+     * @return a className of the target element
      */
     String className() default "";
 
     /**
      * It is a desired element tag.
+     *
+     * @return a desired element tag
      */
     String tagName() default "";
 
     /**
      * It is a xpath to the target element.
+     *
+     * @return a xpath to the target element
      */
     String xpath() default "";
 
     /**
-     * @return priority of the searching. Higher number means lower priority.
+     * Priority of the searching. Higher number means lower priority.
+     *
+     * @return priority of the searching
      */
     int priority() default 0;
 }
diff --git a/src/main/java/io/appium/java_client/pagefactory/WindowsFindBys.java b/src/main/java/io/appium/java_client/pagefactory/WindowsFindBys.java
index 5bd34f460..605986de3 100644
--- a/src/main/java/io/appium/java_client/pagefactory/WindowsFindBys.java
+++ b/src/main/java/io/appium/java_client/pagefactory/WindowsFindBys.java
@@ -32,13 +32,16 @@
 @Repeatable(WindowsFindByChainSet.class)
 public @interface WindowsFindBys {
     /**
-     * It is a set of {@link WindowsBy} strategies which build
-     * the chain of the searching for the target element.
+     * It is a set of {@link WindowsBy} strategies which build the chain of the searching for the target element.
+     *
+     * @return a collection of strategies which build the chain of the searching for the target element
      */
     WindowsBy[] value();
 
     /**
-     * @return priority of the searching. Higher number means lower priority.
+     * Priority of the searching. Higher number means lower priority.
+     *
+     * @return priority of the searching
      */
     int priority() default 0;
 }
diff --git a/src/main/java/io/appium/java_client/pagefactory/WithTimeout.java b/src/main/java/io/appium/java_client/pagefactory/WithTimeout.java
index 80bd2088b..f65fc25d8 100644
--- a/src/main/java/io/appium/java_client/pagefactory/WithTimeout.java
+++ b/src/main/java/io/appium/java_client/pagefactory/WithTimeout.java
@@ -16,7 +16,6 @@
 
 package io.appium.java_client.pagefactory;
 
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -30,12 +29,16 @@
  */
 public @interface WithTimeout {
     /**
-     * Desired waiting duration
+     * Desired waiting duration.
+     *
+     * @return waiting duration
      */
     long time();
 
     /**
-     * Desired time unit
+     * Desired time unit.
+     *
+     * @return time unit
      */
     TimeUnit unit();
 }
diff --git a/src/main/java/io/appium/java_client/pagefactory/bys/builder/AppiumByBuilder.java b/src/main/java/io/appium/java_client/pagefactory/bys/builder/AppiumByBuilder.java
index 0b528d57d..56ac83c29 100644
--- a/src/main/java/io/appium/java_client/pagefactory/bys/builder/AppiumByBuilder.java
+++ b/src/main/java/io/appium/java_client/pagefactory/bys/builder/AppiumByBuilder.java
@@ -162,7 +162,7 @@ protected static By createBy(Annotation[] annotations, HowToUseSelectors howToUs
     /**
      * This method should be used for the setting up of
      * AnnotatedElement instances before the building of
-     * By-locator strategies
+     * By-locator strategies.
      *
      * @param annotated is an instance of class which type extends
      *                  {@link java.lang.reflect.AnnotatedElement}
diff --git a/src/main/java/io/appium/java_client/pagefactory/bys/builder/ByAll.java b/src/main/java/io/appium/java_client/pagefactory/bys/builder/ByAll.java
index fa4285934..7332fe389 100644
--- a/src/main/java/io/appium/java_client/pagefactory/bys/builder/ByAll.java
+++ b/src/main/java/io/appium/java_client/pagefactory/bys/builder/ByAll.java
@@ -29,7 +29,9 @@ private Function<SearchContext, Optional<WebElement>> getSearchingFunction(By by
     }
 
     /**
-     * @param bys is a set of {@link org.openqa.selenium.By} which forms the all possible searching.
+     * Finds all elements that matches any of the locators in sequence.
+     *
+     * @param bys is a set of {@link By} which forms the all possible searching.
      */
     public ByAll(By[] bys) {
         super(bys);
@@ -49,4 +51,4 @@ public WebElement findElement(SearchContext context) {
                 .findFirst()
                 .orElseThrow(() -> new NoSuchElementException("Cannot locate an element using " + toString()));
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/io/appium/java_client/pagefactory/bys/builder/ByChained.java b/src/main/java/io/appium/java_client/pagefactory/bys/builder/ByChained.java
index f25f1d3cc..0ea7dde77 100644
--- a/src/main/java/io/appium/java_client/pagefactory/bys/builder/ByChained.java
+++ b/src/main/java/io/appium/java_client/pagefactory/bys/builder/ByChained.java
@@ -43,7 +43,9 @@ private static AppiumFunction<SearchContext, WebElement> getSearchingFunction(By
     }
 
     /**
-     * @param bys is a set of {@link org.openqa.selenium.By} which forms the chain of the searching.
+     * Finds elements that matches each of the locators in sequence.
+     *
+     * @param bys is a set of {@link By} which forms the chain of the searching.
      */
     public ByChained(By[] bys) {
         super(bys);
diff --git a/src/main/java/io/appium/java_client/pagefactory/iOSBy.java b/src/main/java/io/appium/java_client/pagefactory/iOSBy.java
index 0b7623bc6..1f79ee9f4 100644
--- a/src/main/java/io/appium/java_client/pagefactory/iOSBy.java
+++ b/src/main/java/io/appium/java_client/pagefactory/iOSBy.java
@@ -22,9 +22,11 @@
  */
 public @interface iOSBy {
     /**
-     * It is is iOS UIAutomation string.
+     * It is an iOS UIAutomation string.
      * Read https://developer.apple.com/library/tvos/documentation/DeveloperTools/
      * Conceptual/InstrumentsUserGuide/UIAutomation.html
+     *
+     * @return an iOS UIAutomation string
      */
     String uiAutomator() default "";
 
@@ -32,31 +34,43 @@
      * It an UI automation accessibility Id which is a convenient to iOS.
      * About iOS accessibility
      * See  <a href="https://goo.gl/7sEkoB">UIAccessibilityIdentification</a>
+     *
+     * @return an UI automation accessibility Id
      */
     String accessibility() default "";
 
     /**
      * It is an id of the target element.
+     *
+     * @return an id of the target element
      */
     String id() default "";
 
     /**
      * It is a name of a type/class of the target element.
+     *
+     * @return a name of a type/class of the target element
      */
     String className() default "";
 
     /**
      * It is a desired element tag.
+     *
+     * @return a desired element tag
      */
     String tagName() default "";
 
     /**
      * It is a xpath to the target element.
+     *
+     * @return a xpath to the target element
      */
     String xpath() default "";
 
     /**
-     * @return priority of the searching. Higher number means lower priority.
+     * Priority of the searching. Higher number means lower priority.
+     *
+     * @return priority of the searching
      */
     int priority() default 0;
 }
diff --git a/src/main/java/io/appium/java_client/pagefactory/iOSFindAll.java b/src/main/java/io/appium/java_client/pagefactory/iOSFindAll.java
index 5754583d1..c99530e8f 100644
--- a/src/main/java/io/appium/java_client/pagefactory/iOSFindAll.java
+++ b/src/main/java/io/appium/java_client/pagefactory/iOSFindAll.java
@@ -26,7 +26,7 @@
 
 /**
  * Used to mark a field on a Page/Screen Object to indicate that lookup should use a series
- * of {@link io.appium.java_client.pagefactory.iOSBy} tags
+ * of {@link iOSBy} tags
  * It will then search for all elements that match any criteria. Note that elements
  * are not guaranteed to be in document order.
  */
@@ -34,13 +34,16 @@
 @Repeatable(iOSFindByAllSet.class)
 public @interface iOSFindAll {
     /**
-     * It is a set of {@link io.appium.java_client.pagefactory.iOSBy} strategies which may be
-     * used to find the target element.
+     * It is a set of {@link iOSBy} strategies which may be used to find the target element.
+     *
+     * @return a collection of strategies which may be used to find the target element
      */
     iOSBy[] value();
 
     /**
-     * @return priority of the searching. Higher number means lower priority.
+     * Priority of the searching. Higher number means lower priority.
+     *
+     * @return priority of the searching
      */
     int priority() default 0;
 }
diff --git a/src/main/java/io/appium/java_client/pagefactory/iOSFindBy.java b/src/main/java/io/appium/java_client/pagefactory/iOSFindBy.java
index 5c365fe4a..c9e124568 100644
--- a/src/main/java/io/appium/java_client/pagefactory/iOSFindBy.java
+++ b/src/main/java/io/appium/java_client/pagefactory/iOSFindBy.java
@@ -36,9 +36,11 @@
 @Repeatable(iOSFindBySet.class)
 public @interface iOSFindBy {
     /**
-     * It is is iOS UIAutomation string.
+     * It is an iOS UIAutomation string.
      * Read https://developer.apple.com/library/tvos/documentation/DeveloperTools/
      * Conceptual/InstrumentsUserGuide/UIAutomation.html
+     *
+     * @return an iOS UIAutomation string
      */
     String uiAutomator() default "";
 
@@ -46,31 +48,43 @@
      * It an UI automation accessibility Id which is a convenient to iOS.
      * About iOS accessibility
      * See  <a href="https://goo.gl/7sEkoB">UIAccessibilityIdentification</a>
+     *
+     * @return an UI automation accessibility Id
      */
     String accessibility() default "";
 
     /**
      * It is an id of the target element.
+     *
+     * @return an id of the target element
      */
     String id() default "";
 
     /**
      * It is a name of a type/class of the target element.
+     *
+     * @return a name of a type/class of the target element
      */
     String className() default "";
 
     /**
      * It is a desired element tag.
+     *
+     * @return a desired element tag
      */
     String tagName() default "";
 
     /**
      * It is a xpath to the target element.
+     *
+     * @return a xpath to the target element
      */
     String xpath() default "";
 
     /**
-     * @return priority of the searching. Higher number means lower priority.
+     * Priority of the searching. Higher number means lower priority.
+     *
+     * @return priority of the searching
      */
     int priority() default 0;
 }
diff --git a/src/main/java/io/appium/java_client/pagefactory/iOSFindBys.java b/src/main/java/io/appium/java_client/pagefactory/iOSFindBys.java
index 9d2f0a4c3..aa111c268 100644
--- a/src/main/java/io/appium/java_client/pagefactory/iOSFindBys.java
+++ b/src/main/java/io/appium/java_client/pagefactory/iOSFindBys.java
@@ -26,19 +26,22 @@
 
 /**
  * Used to mark a field on a Page Object to indicate that lookup should use
- * a series of {@link io.appium.java_client.pagefactory.iOSBy} tags.
+ * a series of {@link iOSBy} tags.
  */
 @Retention(RUNTIME) @Target({FIELD, TYPE})
 @Repeatable(iOSFindByChainSet.class)
 public @interface iOSFindBys {
     /**
-     * It is a set of {@link io.appium.java_client.pagefactory.iOSBy} strategies which build
-     * the chain of the searching for the target element.
+     * It is a set of {@link iOSBy} strategies which build the chain of the searching for the target element.
+     *
+     * @return a collection of strategies which build the chain of the searching for the target element
      */
     iOSBy[] value();
 
     /**
-     * @return priority of the searching. Higher number means lower priority.
+     * Priority of the searching. Higher number means lower priority.
+     *
+     * @return priority of the searching
      */
     int priority() default 0;
 }
diff --git a/src/main/java/io/appium/java_client/pagefactory/iOSXCUITBy.java b/src/main/java/io/appium/java_client/pagefactory/iOSXCUITBy.java
index f3a1e8100..02eb4da5f 100644
--- a/src/main/java/io/appium/java_client/pagefactory/iOSXCUITBy.java
+++ b/src/main/java/io/appium/java_client/pagefactory/iOSXCUITBy.java
@@ -26,12 +26,16 @@
      * search direct children elements. See the
      * <a href="https://github.com/facebook/WebDriverAgent/wiki/Queries">
      * documentation</a> for more details.
+     *
+     * @return iOS class chain
      */
     String iOSClassChain() default "";
 
     /**
      * The NSPredicate class is used to define logical conditions used to constrain
      * a search either for a fetch or for in-memory filtering.
+     *
+     * @return iOS NSPredicate
      */
     String iOSNsPredicate() default "";
 
@@ -39,31 +43,43 @@
      * It an UI automation accessibility Id which is a convenient to iOS.
      * About iOS accessibility
      * See  <a href="https://goo.gl/a3AivX">UIAccessibilityIdentification</a>
+     *
+     * @return an UI automation accessibility Id
      */
     String accessibility() default "";
 
     /**
      * It is an id of the target element.
+     *
+     * @return an id of the target element
      */
     String id() default "";
 
     /**
      * It is a name of a type/class of the target element.
+     *
+     * @return a name of a type/class of the target element
      */
     String className() default "";
 
     /**
      * It is a desired element tag.
+     *
+     * @return a desired element tag
      */
     String tagName() default "";
 
     /**
      * It is a xpath to the target element.
+     *
+     * @return a xpath to the target element
      */
     String xpath() default "";
 
     /**
-     * @return priority of the searching. Higher number means lower priority.
+     * Priority of the searching. Higher number means lower priority.
+     *
+     * @return priority of the searching
      */
     int priority() default 0;
 }
diff --git a/src/main/java/io/appium/java_client/pagefactory/iOSXCUITFindAll.java b/src/main/java/io/appium/java_client/pagefactory/iOSXCUITFindAll.java
index 95af79c36..fca06400c 100644
--- a/src/main/java/io/appium/java_client/pagefactory/iOSXCUITFindAll.java
+++ b/src/main/java/io/appium/java_client/pagefactory/iOSXCUITFindAll.java
@@ -26,7 +26,7 @@
 
 /**
  * Used to mark a field on a Page/Screen Object to indicate that lookup should use a series
- * of {@link io.appium.java_client.pagefactory.iOSXCUITBy} tags
+ * of {@link iOSXCUITBy} tags
  * It will then search for all elements that match any criteria. Note that elements
  * are not guaranteed to be in document order.
  */
@@ -34,13 +34,16 @@
 @Repeatable(iOSXCUITFindByAllSet.class)
 public @interface iOSXCUITFindAll {
     /**
-     * It is a set of {@link io.appium.java_client.pagefactory.iOSXCUITBy} strategies which may be
-     * used to find the target element.
+     * It is a set of {@link iOSXCUITBy} strategies which may be used to find the target element.
+     *
+     * @return a collection of strategies which may be used to find the target element
      */
     iOSXCUITBy[] value();
 
     /**
-     * @return priority of the searching. Higher number means lower priority.
+     * Priority of the searching. Higher number means lower priority.
+     *
+     * @return priority of the searching
      */
     int priority() default 0;
 }
diff --git a/src/main/java/io/appium/java_client/pagefactory/iOSXCUITFindBy.java b/src/main/java/io/appium/java_client/pagefactory/iOSXCUITFindBy.java
index 63caf7cf4..cee419e39 100644
--- a/src/main/java/io/appium/java_client/pagefactory/iOSXCUITFindBy.java
+++ b/src/main/java/io/appium/java_client/pagefactory/iOSXCUITFindBy.java
@@ -33,12 +33,16 @@
      * search direct children elements. See the
      * <a href="https://github.com/facebook/WebDriverAgent/wiki/Queries">
      * documentation</a> for more details.
+     *
+     * @return iOS class chain
      */
     String iOSClassChain() default "";
 
     /**
      * The NSPredicate class is used to define logical conditions used to constrain
      * a search either for a fetch or for in-memory filtering.
+     *
+     * @return iOS NSPredicate
      */
     String iOSNsPredicate() default "";
 
@@ -46,31 +50,43 @@
      * It an UI automation accessibility Id which is a convenient to iOS.
      * About iOS accessibility
      * See  <a href="https://goo.gl/a3AivX">UIAccessibilityIdentification</a>
+     *
+     * @return an UI automation accessibility Id
      */
     String accessibility() default "";
 
     /**
      * It is an id of the target element.
+     *
+     * @return an id of the target element
      */
     String id() default "";
 
     /**
      * It is a name of a type/class of the target element.
+     *
+     * @return a name of a type/class of the target element
      */
     String className() default "";
 
     /**
      * It is a desired element tag.
+     *
+     * @return a desired element tag
      */
     String tagName() default "";
 
     /**
      * It is a xpath to the target element.
+     *
+     * @return a xpath to the target element
      */
     String xpath() default "";
 
     /**
-     * @return priority of the searching. Higher number means lower priority.
+     * Priority of the searching. Higher number means lower priority.
+     *
+     * @return priority of the searching
      */
     int priority() default 0;
 }
diff --git a/src/main/java/io/appium/java_client/pagefactory/iOSXCUITFindBys.java b/src/main/java/io/appium/java_client/pagefactory/iOSXCUITFindBys.java
index ad241f445..6225e4361 100644
--- a/src/main/java/io/appium/java_client/pagefactory/iOSXCUITFindBys.java
+++ b/src/main/java/io/appium/java_client/pagefactory/iOSXCUITFindBys.java
@@ -26,19 +26,22 @@
 
 /**
  * Used to mark a field on a Page Object to indicate that lookup should use
- * a series of {@link io.appium.java_client.pagefactory.iOSXCUITBy} tags.
+ * a series of {@link iOSXCUITBy} tags.
  */
 @Retention(RUNTIME) @Target({FIELD, TYPE})
 @Repeatable(iOSXCUITFindByChainSet.class)
 public @interface iOSXCUITFindBys {
     /**
-     * It is a set of {@link io.appium.java_client.pagefactory.iOSXCUITBy} strategies which build
-     * the chain of the searching for the target element.
+     * It is a set of {@link iOSXCUITBy} strategies which build the chain of the searching for the target element.
+     *
+     * @return a collection of strategies which build the chain of the searching for the target element
      */
     iOSXCUITBy[] value();
 
     /**
-     * @return priority of the searching. Higher number means lower priority.
+     * Priority of the searching. Higher number means lower priority.
+     *
+     * @return priority of the searching
      */
     int priority() default 0;
 }
diff --git a/src/main/java/io/appium/java_client/pagefactory/interceptors/InterceptorOfAListOfElements.java b/src/main/java/io/appium/java_client/pagefactory/interceptors/InterceptorOfAListOfElements.java
index 9130c3cde..8ee630eb4 100644
--- a/src/main/java/io/appium/java_client/pagefactory/interceptors/InterceptorOfAListOfElements.java
+++ b/src/main/java/io/appium/java_client/pagefactory/interceptors/InterceptorOfAListOfElements.java
@@ -37,8 +37,7 @@ protected abstract Object getObject(List<WebElement> elements, Method method, Ob
         throws InvocationTargetException, IllegalAccessException, InstantiationException, Throwable;
 
     /**
-     * Look at
-     * {@link net.sf.cglib.proxy.MethodInterceptor#intercept(Object, Method, Object[], MethodProxy)}
+     * Look at {@link MethodInterceptor#intercept(Object, Method, Object[], MethodProxy)}.
      */
     public Object intercept(Object obj, Method method, Object[] args, MethodProxy proxy)
         throws Throwable {
diff --git a/src/main/java/io/appium/java_client/pagefactory/interceptors/InterceptorOfASingleElement.java b/src/main/java/io/appium/java_client/pagefactory/interceptors/InterceptorOfASingleElement.java
index 6322a3c04..d75b9dbf2 100644
--- a/src/main/java/io/appium/java_client/pagefactory/interceptors/InterceptorOfASingleElement.java
+++ b/src/main/java/io/appium/java_client/pagefactory/interceptors/InterceptorOfASingleElement.java
@@ -39,8 +39,7 @@ protected abstract Object getObject(WebElement element, Method method, Object[]
         throws Throwable;
 
     /**
-     * Look at
-     * {@link net.sf.cglib.proxy.MethodInterceptor#intercept(Object, Method, Object[], MethodProxy)}
+     * Look at {@link MethodInterceptor#intercept(Object, Method, Object[], MethodProxy)}.
      */
     public Object intercept(Object obj, Method method, Object[] args, MethodProxy proxy)
         throws Throwable {
diff --git a/src/main/java/io/appium/java_client/pagefactory/utils/ProxyFactory.java b/src/main/java/io/appium/java_client/pagefactory/utils/ProxyFactory.java
index a8b11c707..2941e9408 100644
--- a/src/main/java/io/appium/java_client/pagefactory/utils/ProxyFactory.java
+++ b/src/main/java/io/appium/java_client/pagefactory/utils/ProxyFactory.java
@@ -16,7 +16,6 @@
 
 package io.appium.java_client.pagefactory.utils;
 
-
 import net.sf.cglib.proxy.Enhancer;
 import net.sf.cglib.proxy.MethodInterceptor;
 
diff --git a/src/main/java/io/appium/java_client/pagefactory/utils/WebDriverUnpackUtility.java b/src/main/java/io/appium/java_client/pagefactory/utils/WebDriverUnpackUtility.java
index ac004a41e..08c301a1f 100644
--- a/src/main/java/io/appium/java_client/pagefactory/utils/WebDriverUnpackUtility.java
+++ b/src/main/java/io/appium/java_client/pagefactory/utils/WebDriverUnpackUtility.java
@@ -33,21 +33,16 @@ public final class WebDriverUnpackUtility {
     private static final String NATIVE_APP_PATTERN = "NATIVE_APP";
 
     /**
-     * This method extract an instance of {@link org.openqa.selenium.WebDriver} from the given
-     * {@link org.openqa.selenium.SearchContext}.
-     * @param searchContext is an instance of {@link org.openqa.selenium.SearchContext}
-     *                It may be the instance of {@link org.openqa.selenium.WebDriver}
-     *                or {@link org.openqa.selenium.WebElement} or some other user's
-     *                extension/implementation.
+     * This method extract an instance of {@link WebDriver} from the given {@link SearchContext}.
+     * @param searchContext is an instance of {@link SearchContext}. It may be the instance of
+     *                {@link WebDriver} or {@link org.openqa.selenium.WebElement} or some other
+     *                user's extension/implementation.
      *                Note: if you want to use your own implementation then it should implement
-     *                {@link org.openqa.selenium.internal.WrapsDriver} or
-     *                      {@link org.openqa.selenium.internal.WrapsElement}
-     * @return the instance of {@link org.openqa.selenium.WebDriver}.
-     *         Note: if the given {@link org.openqa.selenium.SearchContext} is not
-     *         {@link org.openqa.selenium.WebDriver} and it doesn't implement
-     *         {@link org.openqa.selenium.internal.WrapsDriver} or
-     *         {@link org.openqa.selenium.internal.WrapsElement} then this method returns
-     *         null.
+     *                {@link WrapsDriver} or {@link WrapsElement}
+     * @return the instance of {@link WebDriver}.
+     *         Note: if the given {@link SearchContext} is not
+     *         {@link WebDriver} and it doesn't implement
+     *         {@link WrapsDriver} or {@link WrapsElement} then this method returns null.
      *
      */
     public static WebDriver unpackWebDriverFromSearchContext(SearchContext searchContext) {
@@ -60,8 +55,7 @@ public static WebDriver unpackWebDriverFromSearchContext(SearchContext searchCon
                     ((WrapsDriver) searchContext).getWrappedDriver());
         }
 
-        // Search context it is not only Webdriver. Webelement is search context
-        // too.
+        // Search context it is not only Webdriver. Webelement is search context too.
         // RemoteWebElement and MobileElement implement WrapsDriver
         if (searchContext instanceof WrapsElement) {
             return unpackWebDriverFromSearchContext(
@@ -72,23 +66,18 @@ public static WebDriver unpackWebDriverFromSearchContext(SearchContext searchCon
     }
 
     /**
-     * @param context is an instance of {@link org.openqa.selenium.SearchContext}
-     *                It may be the instance of {@link org.openqa.selenium.WebDriver}
-     *                or {@link org.openqa.selenium.WebElement} or some other user's
-     *                extension/implementation.
+     * Detects content type by the provided search {@code context}.
+     *
+     * @param context is an instance of {@link SearchContext}. It may be the instance of
+     *                {@link WebDriver} or {@link org.openqa.selenium.WebElement} or some other
+     *                user's extension/implementation.
      *                Note: if you want to use your own implementation then it should
-     *                implement {@link org.openqa.selenium.ContextAware} or
-     *                {@link org.openqa.selenium.internal.WrapsDriver} or
-     *                {@link HasSessionDetails}
+     *                implement {@link ContextAware} or {@link WrapsDriver} or {@link HasSessionDetails}
      * @return current content type. It depends on current context. If current context is
-     *     NATIVE_APP it will return
-     * {@link io.appium.java_client.pagefactory.bys.ContentType#NATIVE_MOBILE_SPECIFIC}.
-     * {@link io.appium.java_client.pagefactory.bys.ContentType#HTML_OR_DEFAULT} will be returned
-     *     if the current context is WEB_VIEW.
-     * {@link io.appium.java_client.pagefactory.bys.ContentType#HTML_OR_DEFAULT} also will be
-     *     returned if the given {@link org.openqa.selenium.SearchContext}
-     *     instance doesn't implement
-     * {@link org.openqa.selenium.ContextAware} and {@link org.openqa.selenium.internal.WrapsDriver}
+     *                NATIVE_APP it will return {@link ContentType#NATIVE_MOBILE_SPECIFIC}.
+     *                {@link ContentType#HTML_OR_DEFAULT} will be returned if the current context is WEB_VIEW.
+     *                {@link ContentType#HTML_OR_DEFAULT} also will be returned if the given
+     *                {@link SearchContext} instance doesn't implement {@link ContextAware} and {@link WrapsDriver}
      */
     public static ContentType getCurrentContentType(SearchContext context) {
         return ofNullable(unpackWebDriverFromSearchContext(context)).map(driver -> {
diff --git a/src/main/java/io/appium/java_client/remote/AndroidMobileCapabilityType.java b/src/main/java/io/appium/java_client/remote/AndroidMobileCapabilityType.java
index a9474f371..10ab18ff0 100644
--- a/src/main/java/io/appium/java_client/remote/AndroidMobileCapabilityType.java
+++ b/src/main/java/io/appium/java_client/remote/AndroidMobileCapabilityType.java
@@ -16,7 +16,6 @@
 
 package io.appium.java_client.remote;
 
-
 import org.openqa.selenium.remote.CapabilityType;
 
 /**
diff --git a/src/main/java/io/appium/java_client/service/local/AppiumDriverLocalService.java b/src/main/java/io/appium/java_client/service/local/AppiumDriverLocalService.java
index 16ce2f3cd..f2db2881b 100644
--- a/src/main/java/io/appium/java_client/service/local/AppiumDriverLocalService.java
+++ b/src/main/java/io/appium/java_client/service/local/AppiumDriverLocalService.java
@@ -77,6 +77,8 @@ public static AppiumDriverLocalService buildService(AppiumServiceBuilder builder
     }
 
     /**
+     * Base URL.
+     *
      * @return The base URL for the managed appium server.
      */
     @Override public URL getUrl() {
@@ -114,7 +116,7 @@ private void ping(long time, TimeUnit timeUnit) throws UrlChecker.TimeoutExcepti
     }
 
     /**
-     * Starts the defined appium server
+     * Starts the defined appium server.
      *
      * @throws AppiumServerHasNotBeenStartedLocallyException
      * If an error occurs while spawning the child process.
@@ -178,6 +180,8 @@ private void destroyProcess() {
     }
 
     /**
+     * Logs as string.
+     *
      * @return String logs if the server has been run.
      *     null is returned otherwise.
      */
@@ -190,8 +194,8 @@ public String getStdOut() {
     }
 
     /**
-     * Adds other output stream which should accept server output data
-     * @param outputStream is an instance of {@link java.io.OutputStream}
+     * Adds other output stream which should accept server output data.
+     * @param outputStream is an instance of {@link OutputStream}
      *                     that is ready to accept server output
      */
     public void addOutPutStream(OutputStream outputStream) {
@@ -200,8 +204,8 @@ public void addOutPutStream(OutputStream outputStream) {
     }
 
     /**
-     * Adds other output streams which should accept server output data
-     * @param outputStreams is a list of additional {@link java.io.OutputStream}
+     * Adds other output streams which should accept server output data.
+     * @param outputStreams is a list of additional {@link OutputStream}
      *                      that are ready to accept server output
      */
     public void addOutPutStreams(List<OutputStream> outputStreams) {
diff --git a/src/main/java/io/appium/java_client/service/local/AppiumServiceBuilder.java b/src/main/java/io/appium/java_client/service/local/AppiumServiceBuilder.java
index b0413d165..08522521c 100644
--- a/src/main/java/io/appium/java_client/service/local/AppiumServiceBuilder.java
+++ b/src/main/java/io/appium/java_client/service/local/AppiumServiceBuilder.java
@@ -226,6 +226,8 @@ public AppiumServiceBuilder withArgument(ServerArgument argument) {
     }
 
     /**
+     * Adds a server argument.
+     *
      * @param argument is an instance which contains the argument name.
      * @param value    A non null string value. (Warn!!!) Boolean arguments have a special moment:
      *                 the presence of an arguments means "true". At this case an empty string
@@ -247,8 +249,9 @@ public AppiumServiceBuilder withArgument(ServerArgument argument, String value)
     }
 
     /**
-     * @param capabilities is an instance of
-     * {@link org.openqa.selenium.remote.DesiredCapabilities}.
+     * Adds a desired capabilities.
+     *
+     * @param capabilities is an instance of {@link DesiredCapabilities}.
      * @return the self-reference.
      */
     public AppiumServiceBuilder withCapabilities(DesiredCapabilities capabilities) {
@@ -263,6 +266,8 @@ public AppiumServiceBuilder withCapabilities(DesiredCapabilities capabilities) {
     }
 
     /**
+     * Sets an executable appium.js.
+     *
      * @param appiumJS an executable appium.js (1.4.x and lower) or
      *                 main.js (1.5.x and higher).
      * @return the self-reference.
@@ -278,6 +283,8 @@ public AppiumServiceBuilder withIPAddress(String ipAddress) {
     }
 
     /**
+     * Sets start up timeout.
+     *
      * @param time     a time value for the service starting up.
      * @param timeUnit a time unit for the service starting up.
      * @return self-reference.
diff --git a/src/main/java/io/appium/java_client/service/local/ListOutputStream.java b/src/main/java/io/appium/java_client/service/local/ListOutputStream.java
index c0d83cef4..72f6a476b 100644
--- a/src/main/java/io/appium/java_client/service/local/ListOutputStream.java
+++ b/src/main/java/io/appium/java_client/service/local/ListOutputStream.java
@@ -16,7 +16,6 @@
 
 package io.appium.java_client.service.local;
 
-
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.ArrayList;
diff --git a/src/main/java/io/appium/java_client/touch/offset/ElementOption.java b/src/main/java/io/appium/java_client/touch/offset/ElementOption.java
index 0840ea077..0f8d056e9 100644
--- a/src/main/java/io/appium/java_client/touch/offset/ElementOption.java
+++ b/src/main/java/io/appium/java_client/touch/offset/ElementOption.java
@@ -16,7 +16,7 @@ public class ElementOption extends PointOption<ElementOption> {
     private String elementId;
 
     /**
-     * This method creates a build instance of the {@link ElementOption}
+     * This method creates a build instance of the {@link ElementOption}.
      *
      * @param element is the element to calculate offset from.
      * @param x is the x-offset from the upper left corner of the given element.
@@ -28,7 +28,7 @@ public static ElementOption element(WebElement element, int x, int y) {
     }
 
     /**
-     * This method creates a build instance of the {@link ElementOption}
+     * This method creates a build instance of the {@link ElementOption}.
      *
      * @param element is the element to calculate offset from.
      * @return the built option
diff --git a/src/test/java/io/appium/java_client/ChromeDriverPathUtil.java b/src/test/java/io/appium/java_client/ChromeDriverPathUtil.java
index 272f0da28..cb9af5736 100644
--- a/src/test/java/io/appium/java_client/ChromeDriverPathUtil.java
+++ b/src/test/java/io/appium/java_client/ChromeDriverPathUtil.java
@@ -15,6 +15,8 @@ public final class ChromeDriverPathUtil {
             .resolve("test").resolve("java").resolve("io").resolve("appium").resolve("java_client");
 
     /**
+     * Finds chromedriver executable file depending on the current platform.
+     *
      * @return the choromedriver file which depends on platform.
      */
     public static File getChromeDriver() {
diff --git a/src/test/java/io/appium/java_client/android/OpenNotificationsTest.java b/src/test/java/io/appium/java_client/android/OpenNotificationsTest.java
index 31254026e..ebb553789 100644
--- a/src/test/java/io/appium/java_client/android/OpenNotificationsTest.java
+++ b/src/test/java/io/appium/java_client/android/OpenNotificationsTest.java
@@ -3,7 +3,6 @@
 import static org.junit.Assert.assertNotEquals;
 import static org.openqa.selenium.By.id;
 
-
 import org.junit.Test;
 
 import org.openqa.selenium.support.ui.WebDriverWait;
diff --git a/src/test/java/io/appium/java_client/ios/IOSElementTest.java b/src/test/java/io/appium/java_client/ios/IOSElementTest.java
index 9c3cf1692..cffc44730 100644
--- a/src/test/java/io/appium/java_client/ios/IOSElementTest.java
+++ b/src/test/java/io/appium/java_client/ios/IOSElementTest.java
@@ -5,7 +5,6 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
 
-
 import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runners.MethodSorters;