diff --git a/google-style.xml b/appium-style.xml
similarity index 93%
rename from google-style.xml
rename to appium-style.xml
index 5762dbafb..03937a66d 100755
--- a/google-style.xml
+++ b/appium-style.xml
@@ -2,20 +2,10 @@
 <!DOCTYPE module PUBLIC
         "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
         "http://checkstyle.sourceforge.net/dtds/configuration_1_3.dtd">
-
-<!-- Originally designed by:-->
 <!--
-    Checkstyle configuration that checks the Google coding conventions from Google Java Style
-    that can be found at https://google.github.io/styleguide/javaguide.html.
-
-    Checkstyle is very configurable. Be sure to read the documentation at
-    http://checkstyle.sf.net (or in your downloaded distribution).
-
-    To completely disable a check, just comment it out or delete it from the file.
-
-    Authors: Max Vetrenko, Ruslan Diachenko, Roman Ivanov.
+    Checkstyle configuration that checks the Appium coding conventions (partially based on Google Java Style
+    that can be found at https://google.github.io/styleguide/javaguide.html).
  -->
-<!-- Modified by: Sergey Tikhomirov-->
 
 <module name = "Checker">
     <property name="charset" value="UTF-8"/>
@@ -41,9 +31,16 @@
             <property name="allowByTailComment" value="true"/>
             <property name="allowNonPrintableEscapes" value="true"/>
         </module>
-        <module name="AvoidStarImport">
-            <property name="severity" value="warning"/>
-        </module>
+        <module name="AvoidStarImport"/>
+        <module name="CustomImportOrder">
+          <property name="customImportOrderRules" value="THIRD_PARTY_PACKAGE###SPECIAL_IMPORTS###STANDARD_JAVA_PACKAGE###STATIC"/>
+          <property name="specialImportsRegExp" value="^javax\."/>
+          <property name="standardPackageRegExp" value="^java\."/>
+          <property name="sortImportsInGroupAlphabetically" value="true"/>
+          <property name="separateLineBetweenGroups" value="false"/>
+       </module>
+       <module name="RedundantImport"/>
+       <module name="UnusedImports"/>
         <module name="OneTopLevelClass"/>
         <module name="NoLineWrap"/>
         <module name="EmptyBlock">
diff --git a/build.gradle b/build.gradle
index 8918b815d..b64f8cebb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -96,7 +96,7 @@ jacocoTestReport.dependsOn test
 
 checkstyle {
     toolVersion = '8.32'
-    configFile = file("$projectDir/google-style.xml")
+    configFile = file("$projectDir/appium-style.xml")
     showViolations = true
     ignoreFailures = false
 }
diff --git a/src/main/java/io/appium/java_client/AppiumDriver.java b/src/main/java/io/appium/java_client/AppiumDriver.java
index 450822a69..0c72f9c86 100644
--- a/src/main/java/io/appium/java_client/AppiumDriver.java
+++ b/src/main/java/io/appium/java_client/AppiumDriver.java
@@ -16,11 +16,6 @@
 
 package io.appium.java_client;
 
-import static io.appium.java_client.internal.CapabilityHelpers.APPIUM_PREFIX;
-import static io.appium.java_client.remote.MobileCapabilityType.AUTOMATION_NAME;
-import static io.appium.java_client.remote.MobileCapabilityType.PLATFORM_NAME;
-import static org.apache.commons.lang3.StringUtils.isBlank;
-
 import io.appium.java_client.internal.CapabilityHelpers;
 import io.appium.java_client.remote.AppiumCommandExecutor;
 import io.appium.java_client.remote.AppiumNewSessionCommandPayload;
@@ -51,6 +46,11 @@
 import java.util.Collections;
 import java.util.Map;
 
+import static io.appium.java_client.internal.CapabilityHelpers.APPIUM_PREFIX;
+import static io.appium.java_client.remote.MobileCapabilityType.AUTOMATION_NAME;
+import static io.appium.java_client.remote.MobileCapabilityType.PLATFORM_NAME;
+import static org.apache.commons.lang3.StringUtils.isBlank;
+
 /**
  * Default Appium driver implementation.
  */
diff --git a/src/main/java/io/appium/java_client/AppiumExecutionMethod.java b/src/main/java/io/appium/java_client/AppiumExecutionMethod.java
index 3abe1ef4f..9b9f79cb9 100644
--- a/src/main/java/io/appium/java_client/AppiumExecutionMethod.java
+++ b/src/main/java/io/appium/java_client/AppiumExecutionMethod.java
@@ -17,7 +17,6 @@
 package io.appium.java_client;
 
 import com.google.common.collect.ImmutableMap;
-
 import org.openqa.selenium.remote.ExecuteMethod;
 import org.openqa.selenium.remote.Response;
 
diff --git a/src/main/java/io/appium/java_client/AppiumFluentWait.java b/src/main/java/io/appium/java_client/AppiumFluentWait.java
index 8f197ef47..d914f6c16 100644
--- a/src/main/java/io/appium/java_client/AppiumFluentWait.java
+++ b/src/main/java/io/appium/java_client/AppiumFluentWait.java
@@ -17,7 +17,6 @@
 package io.appium.java_client;
 
 import com.google.common.base.Throwables;
-
 import lombok.AccessLevel;
 import lombok.Getter;
 import org.openqa.selenium.TimeoutException;
diff --git a/src/main/java/io/appium/java_client/ComparesImages.java b/src/main/java/io/appium/java_client/ComparesImages.java
index c1c97abc9..4aeefec6a 100644
--- a/src/main/java/io/appium/java_client/ComparesImages.java
+++ b/src/main/java/io/appium/java_client/ComparesImages.java
@@ -16,8 +16,6 @@
 
 package io.appium.java_client;
 
-import static io.appium.java_client.MobileCommand.compareImagesCommand;
-
 import io.appium.java_client.imagecomparison.ComparisonMode;
 import io.appium.java_client.imagecomparison.FeaturesMatchingOptions;
 import io.appium.java_client.imagecomparison.FeaturesMatchingResult;
@@ -27,11 +25,13 @@
 import io.appium.java_client.imagecomparison.SimilarityMatchingResult;
 import org.apache.commons.io.FileUtils;
 
+import javax.annotation.Nullable;
 import java.io.File;
 import java.io.IOException;
 import java.util.Base64;
 import java.util.Map;
-import javax.annotation.Nullable;
+
+import static io.appium.java_client.MobileCommand.compareImagesCommand;
 
 public interface ComparesImages extends ExecutesMethod {
 
diff --git a/src/main/java/io/appium/java_client/ErrorCodesMobile.java b/src/main/java/io/appium/java_client/ErrorCodesMobile.java
index 924625b08..6e7e66d69 100644
--- a/src/main/java/io/appium/java_client/ErrorCodesMobile.java
+++ b/src/main/java/io/appium/java_client/ErrorCodesMobile.java
@@ -18,7 +18,6 @@
 package io.appium.java_client;
 
 import com.google.common.collect.ImmutableMap;
-
 import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.remote.ErrorCodes;
 
diff --git a/src/main/java/io/appium/java_client/HasAppStrings.java b/src/main/java/io/appium/java_client/HasAppStrings.java
index 0c9b3905f..1983d4667 100644
--- a/src/main/java/io/appium/java_client/HasAppStrings.java
+++ b/src/main/java/io/appium/java_client/HasAppStrings.java
@@ -16,12 +16,12 @@
 
 package io.appium.java_client;
 
-import static io.appium.java_client.MobileCommand.GET_STRINGS;
-import static io.appium.java_client.MobileCommand.prepareArguments;
-
 import java.util.AbstractMap;
 import java.util.Map;
 
+import static io.appium.java_client.MobileCommand.GET_STRINGS;
+import static io.appium.java_client.MobileCommand.prepareArguments;
+
 public interface HasAppStrings extends ExecutesMethod {
     /**
      * Get all defined Strings from an app for the default language.
diff --git a/src/main/java/io/appium/java_client/HasDeviceTime.java b/src/main/java/io/appium/java_client/HasDeviceTime.java
index fa9df8997..fb9fc59b6 100644
--- a/src/main/java/io/appium/java_client/HasDeviceTime.java
+++ b/src/main/java/io/appium/java_client/HasDeviceTime.java
@@ -16,16 +16,15 @@
 
 package io.appium.java_client;
 
-import static io.appium.java_client.MobileCommand.GET_DEVICE_TIME;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-
 import org.openqa.selenium.remote.DriverCommand;
 import org.openqa.selenium.remote.Response;
 
 import java.util.Map;
 
+import static io.appium.java_client.MobileCommand.GET_DEVICE_TIME;
+
 public interface HasDeviceTime extends ExecutesMethod {
 
     /**
diff --git a/src/main/java/io/appium/java_client/HasSettings.java b/src/main/java/io/appium/java_client/HasSettings.java
index 8210123a7..73befa6f5 100644
--- a/src/main/java/io/appium/java_client/HasSettings.java
+++ b/src/main/java/io/appium/java_client/HasSettings.java
@@ -16,9 +16,6 @@
 
 package io.appium.java_client;
 
-import static io.appium.java_client.MobileCommand.getSettingsCommand;
-import static io.appium.java_client.MobileCommand.setSettingsCommand;
-
 import org.openqa.selenium.remote.Response;
 
 import java.util.EnumMap;
@@ -26,6 +23,9 @@
 import java.util.Map.Entry;
 import java.util.stream.Collectors;
 
+import static io.appium.java_client.MobileCommand.getSettingsCommand;
+import static io.appium.java_client.MobileCommand.setSettingsCommand;
+
 public interface HasSettings extends ExecutesMethod {
 
     /**
diff --git a/src/main/java/io/appium/java_client/InteractsWithApps.java b/src/main/java/io/appium/java_client/InteractsWithApps.java
index f1a15146e..eb73e6e30 100644
--- a/src/main/java/io/appium/java_client/InteractsWithApps.java
+++ b/src/main/java/io/appium/java_client/InteractsWithApps.java
@@ -16,26 +16,25 @@
 
 package io.appium.java_client;
 
-import static io.appium.java_client.MobileCommand.ACTIVATE_APP;
-import static io.appium.java_client.MobileCommand.INSTALL_APP;
-import static io.appium.java_client.MobileCommand.IS_APP_INSTALLED;
-import static io.appium.java_client.MobileCommand.QUERY_APP_STATE;
-import static io.appium.java_client.MobileCommand.REMOVE_APP;
-import static io.appium.java_client.MobileCommand.RUN_APP_IN_BACKGROUND;
-import static io.appium.java_client.MobileCommand.TERMINATE_APP;
-import static io.appium.java_client.MobileCommand.prepareArguments;
-
 import com.google.common.collect.ImmutableMap;
-
 import io.appium.java_client.appmanagement.ApplicationState;
 import io.appium.java_client.appmanagement.BaseActivateApplicationOptions;
 import io.appium.java_client.appmanagement.BaseInstallApplicationOptions;
 import io.appium.java_client.appmanagement.BaseRemoveApplicationOptions;
 import io.appium.java_client.appmanagement.BaseTerminateApplicationOptions;
 
+import javax.annotation.Nullable;
 import java.time.Duration;
 import java.util.AbstractMap;
-import javax.annotation.Nullable;
+
+import static io.appium.java_client.MobileCommand.ACTIVATE_APP;
+import static io.appium.java_client.MobileCommand.INSTALL_APP;
+import static io.appium.java_client.MobileCommand.IS_APP_INSTALLED;
+import static io.appium.java_client.MobileCommand.QUERY_APP_STATE;
+import static io.appium.java_client.MobileCommand.REMOVE_APP;
+import static io.appium.java_client.MobileCommand.RUN_APP_IN_BACKGROUND;
+import static io.appium.java_client.MobileCommand.TERMINATE_APP;
+import static io.appium.java_client.MobileCommand.prepareArguments;
 
 @SuppressWarnings("rawtypes")
 public interface InteractsWithApps extends ExecutesMethod {
diff --git a/src/main/java/io/appium/java_client/LocksDevice.java b/src/main/java/io/appium/java_client/LocksDevice.java
index 944624002..ce4d794c8 100644
--- a/src/main/java/io/appium/java_client/LocksDevice.java
+++ b/src/main/java/io/appium/java_client/LocksDevice.java
@@ -16,12 +16,12 @@
 
 package io.appium.java_client;
 
+import java.time.Duration;
+
 import static io.appium.java_client.MobileCommand.getIsDeviceLockedCommand;
 import static io.appium.java_client.MobileCommand.lockDeviceCommand;
 import static io.appium.java_client.MobileCommand.unlockDeviceCommand;
 
-import java.time.Duration;
-
 public interface LocksDevice extends ExecutesMethod {
 
     /**
diff --git a/src/main/java/io/appium/java_client/LogsEvents.java b/src/main/java/io/appium/java_client/LogsEvents.java
index 7844b56a6..a29d9eecf 100644
--- a/src/main/java/io/appium/java_client/LogsEvents.java
+++ b/src/main/java/io/appium/java_client/LogsEvents.java
@@ -16,19 +16,20 @@
 
 package io.appium.java_client;
 
-import static io.appium.java_client.MobileCommand.GET_EVENTS;
-import static io.appium.java_client.MobileCommand.LOG_EVENT;
-
 import com.google.common.collect.ImmutableMap;
 import io.appium.java_client.serverevents.CommandEvent;
 import io.appium.java_client.serverevents.CustomEvent;
-import io.appium.java_client.serverevents.TimedEvent;
 import io.appium.java_client.serverevents.ServerEvents;
+import io.appium.java_client.serverevents.TimedEvent;
+import org.openqa.selenium.json.Json;
+import org.openqa.selenium.remote.Response;
+
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
-import org.openqa.selenium.json.Json;
-import org.openqa.selenium.remote.Response;
+
+import static io.appium.java_client.MobileCommand.GET_EVENTS;
+import static io.appium.java_client.MobileCommand.LOG_EVENT;
 
 public interface LogsEvents extends ExecutesMethod {
 
diff --git a/src/main/java/io/appium/java_client/MobileBy.java b/src/main/java/io/appium/java_client/MobileBy.java
index 65f382ec7..7d30bd855 100644
--- a/src/main/java/io/appium/java_client/MobileBy.java
+++ b/src/main/java/io/appium/java_client/MobileBy.java
@@ -16,10 +16,10 @@
 
 package io.appium.java_client;
 
-import java.io.Serializable;
-
 import org.openqa.selenium.By;
 
+import java.io.Serializable;
+
 /**
  * Appium locating strategies.
  *
diff --git a/src/main/java/io/appium/java_client/MobileCommand.java b/src/main/java/io/appium/java_client/MobileCommand.java
index 4d20164ad..b87e76949 100644
--- a/src/main/java/io/appium/java_client/MobileCommand.java
+++ b/src/main/java/io/appium/java_client/MobileCommand.java
@@ -17,7 +17,6 @@
 package io.appium.java_client;
 
 import com.google.common.collect.ImmutableMap;
-
 import io.appium.java_client.imagecomparison.BaseComparisonOptions;
 import io.appium.java_client.imagecomparison.ComparisonMode;
 import io.appium.java_client.screenrecording.BaseStartScreenRecordingOptions;
@@ -26,12 +25,12 @@
 import org.openqa.selenium.remote.CommandInfo;
 import org.openqa.selenium.remote.http.HttpMethod;
 
+import javax.annotation.Nullable;
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.util.AbstractMap;
 import java.util.HashMap;
 import java.util.Map;
-import javax.annotation.Nullable;
 
 /**
  * The repository of mobile commands defined in the Mobile JSON
diff --git a/src/main/java/io/appium/java_client/MultiTouchAction.java b/src/main/java/io/appium/java_client/MultiTouchAction.java
index ac66594dc..1549fbdf5 100644
--- a/src/main/java/io/appium/java_client/MultiTouchAction.java
+++ b/src/main/java/io/appium/java_client/MultiTouchAction.java
@@ -16,15 +16,15 @@
 
 package io.appium.java_client;
 
-import static com.google.common.base.Preconditions.checkArgument;
-import static java.util.stream.Collectors.toList;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 
 import java.util.List;
 import java.util.Map;
 
+import static com.google.common.base.Preconditions.checkArgument;
+import static java.util.stream.Collectors.toList;
+
 /**
  * Used for Webdriver 3 multi-touch gestures
  * See the Webriver 3 spec https://dvcs.w3.org/hg/webdriver/raw-file/default/webdriver-spec.html
diff --git a/src/main/java/io/appium/java_client/PerformsTouchActions.java b/src/main/java/io/appium/java_client/PerformsTouchActions.java
index 0ac7776d6..539a38a52 100644
--- a/src/main/java/io/appium/java_client/PerformsTouchActions.java
+++ b/src/main/java/io/appium/java_client/PerformsTouchActions.java
@@ -16,12 +16,12 @@
 
 package io.appium.java_client;
 
-import static io.appium.java_client.MobileCommand.PERFORM_MULTI_TOUCH;
-import static io.appium.java_client.MobileCommand.PERFORM_TOUCH_ACTION;
-
 import java.util.List;
 import java.util.Map;
 
+import static io.appium.java_client.MobileCommand.PERFORM_MULTI_TOUCH;
+import static io.appium.java_client.MobileCommand.PERFORM_TOUCH_ACTION;
+
 /**
  * Touch actions are deprecated.
  * Please use W3C Actions instead or the corresponding
diff --git a/src/main/java/io/appium/java_client/PullsFiles.java b/src/main/java/io/appium/java_client/PullsFiles.java
index 590e4aaa0..f85c18a6e 100644
--- a/src/main/java/io/appium/java_client/PullsFiles.java
+++ b/src/main/java/io/appium/java_client/PullsFiles.java
@@ -16,16 +16,15 @@
 
 package io.appium.java_client;
 
-import static io.appium.java_client.MobileCommand.PULL_FILE;
-import static io.appium.java_client.MobileCommand.PULL_FOLDER;
-
 import com.google.common.collect.ImmutableMap;
-
 import org.openqa.selenium.remote.Response;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
 
+import static io.appium.java_client.MobileCommand.PULL_FILE;
+import static io.appium.java_client.MobileCommand.PULL_FOLDER;
+
 public interface PullsFiles extends ExecutesMethod {
 
     /**
diff --git a/src/main/java/io/appium/java_client/PushesFiles.java b/src/main/java/io/appium/java_client/PushesFiles.java
index a79e58ba9..552c25a83 100644
--- a/src/main/java/io/appium/java_client/PushesFiles.java
+++ b/src/main/java/io/appium/java_client/PushesFiles.java
@@ -16,15 +16,15 @@
 
 package io.appium.java_client;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-import static io.appium.java_client.MobileCommand.pushFileCommand;
-
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.Base64;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+import static io.appium.java_client.MobileCommand.pushFileCommand;
+
 public interface PushesFiles extends ExecutesMethod {
 
     /**
diff --git a/src/main/java/io/appium/java_client/ScreenshotState.java b/src/main/java/io/appium/java_client/ScreenshotState.java
index 5645b79e2..8c88397e5 100644
--- a/src/main/java/io/appium/java_client/ScreenshotState.java
+++ b/src/main/java/io/appium/java_client/ScreenshotState.java
@@ -21,9 +21,7 @@
 import lombok.Setter;
 import lombok.experimental.Accessors;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-import static java.util.Optional.ofNullable;
-
+import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -33,7 +31,8 @@
 import java.util.function.Function;
 import java.util.function.Supplier;
 
-import javax.imageio.ImageIO;
+import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Optional.ofNullable;
 
 @Accessors(chain = true)
 public class ScreenshotState {
diff --git a/src/main/java/io/appium/java_client/TouchAction.java b/src/main/java/io/appium/java_client/TouchAction.java
index 866e87140..98abeaafb 100644
--- a/src/main/java/io/appium/java_client/TouchAction.java
+++ b/src/main/java/io/appium/java_client/TouchAction.java
@@ -16,13 +16,8 @@
 
 package io.appium.java_client;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.collect.ImmutableList.builder;
-import static java.util.stream.Collectors.toList;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-
 import io.appium.java_client.touch.ActionOptions;
 import io.appium.java_client.touch.LongPressOptions;
 import io.appium.java_client.touch.TapOptions;
@@ -33,6 +28,10 @@
 import java.util.List;
 import java.util.Map;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.collect.ImmutableList.builder;
+import static java.util.stream.Collectors.toList;
+
 /**
  * Used for Webdriver 3 touch actions
  * See the Webriver 3 spec
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 92ed19370..f3b812584 100644
--- a/src/main/java/io/appium/java_client/android/AndroidDriver.java
+++ b/src/main/java/io/appium/java_client/android/AndroidDriver.java
@@ -16,13 +16,7 @@
 
 package io.appium.java_client.android;
 
-import static io.appium.java_client.android.AndroidMobileCommandHelper.endTestCoverageCommand;
-import static io.appium.java_client.android.AndroidMobileCommandHelper.openNotificationsCommand;
-import static io.appium.java_client.android.AndroidMobileCommandHelper.toggleLocationServicesCommand;
-import static org.openqa.selenium.remote.DriverCommand.EXECUTE_SCRIPT;
-
 import com.google.common.collect.ImmutableMap;
-
 import io.appium.java_client.AppiumClientConfig;
 import io.appium.java_client.AppiumDriver;
 import io.appium.java_client.CommandExecutionHelper;
@@ -32,9 +26,9 @@
 import io.appium.java_client.HasOnScreenKeyboard;
 import io.appium.java_client.HidesKeyboard;
 import io.appium.java_client.InteractsWithApps;
-import io.appium.java_client.PullsFiles;
 import io.appium.java_client.LocksDevice;
 import io.appium.java_client.PerformsTouchActions;
+import io.appium.java_client.PullsFiles;
 import io.appium.java_client.PushesFiles;
 import io.appium.java_client.SupportsLegacyAppManagement;
 import io.appium.java_client.android.connection.HasNetworkConnection;
@@ -59,6 +53,11 @@
 import java.util.Collections;
 import java.util.Map;
 
+import static io.appium.java_client.android.AndroidMobileCommandHelper.endTestCoverageCommand;
+import static io.appium.java_client.android.AndroidMobileCommandHelper.openNotificationsCommand;
+import static io.appium.java_client.android.AndroidMobileCommandHelper.toggleLocationServicesCommand;
+import static org.openqa.selenium.remote.DriverCommand.EXECUTE_SCRIPT;
+
 /**
  * Android driver implementation.
  */
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 867e96fdd..c5fa63080 100644
--- a/src/main/java/io/appium/java_client/android/AndroidMobileCommandHelper.java
+++ b/src/main/java/io/appium/java_client/android/AndroidMobileCommandHelper.java
@@ -16,18 +16,16 @@
 
 package io.appium.java_client.android;
 
-import static com.google.common.base.Preconditions.checkArgument;
-
 import com.google.common.collect.ImmutableMap;
-
 import io.appium.java_client.MobileCommand;
-
 import org.apache.commons.lang3.StringUtils;
 import org.openqa.selenium.remote.RemoteWebElement;
 
 import java.util.AbstractMap;
 import java.util.Map;
 
+import static com.google.common.base.Preconditions.checkArgument;
+
 /**
  * This util class helps to prepare parameters of Android-specific JSONWP
  * commands.
diff --git a/src/main/java/io/appium/java_client/android/AndroidStartScreenRecordingOptions.java b/src/main/java/io/appium/java_client/android/AndroidStartScreenRecordingOptions.java
index c8378a86b..2ef6cdc29 100644
--- a/src/main/java/io/appium/java_client/android/AndroidStartScreenRecordingOptions.java
+++ b/src/main/java/io/appium/java_client/android/AndroidStartScreenRecordingOptions.java
@@ -16,16 +16,15 @@
 
 package io.appium.java_client.android;
 
-import static java.util.Optional.ofNullable;
-
 import com.google.common.collect.ImmutableMap;
-
 import io.appium.java_client.screenrecording.BaseStartScreenRecordingOptions;
 import io.appium.java_client.screenrecording.ScreenRecordingUploadOptions;
 
 import java.time.Duration;
 import java.util.Map;
 
+import static java.util.Optional.ofNullable;
+
 public class AndroidStartScreenRecordingOptions
         extends BaseStartScreenRecordingOptions<AndroidStartScreenRecordingOptions> {
     private Integer bitRate;
diff --git a/src/main/java/io/appium/java_client/android/AuthenticatesByFinger.java b/src/main/java/io/appium/java_client/android/AuthenticatesByFinger.java
index 717d5150d..15503e239 100644
--- a/src/main/java/io/appium/java_client/android/AuthenticatesByFinger.java
+++ b/src/main/java/io/appium/java_client/android/AuthenticatesByFinger.java
@@ -1,10 +1,10 @@
 package io.appium.java_client.android;
 
-import static io.appium.java_client.android.AndroidMobileCommandHelper.fingerPrintCommand;
-
 import io.appium.java_client.CommandExecutionHelper;
 import io.appium.java_client.ExecutesMethod;
 
+import static io.appium.java_client.android.AndroidMobileCommandHelper.fingerPrintCommand;
+
 public interface AuthenticatesByFinger extends ExecutesMethod {
 
     /**
diff --git a/src/main/java/io/appium/java_client/android/HasAndroidClipboard.java b/src/main/java/io/appium/java_client/android/HasAndroidClipboard.java
index 063f689cc..40fc24a83 100644
--- a/src/main/java/io/appium/java_client/android/HasAndroidClipboard.java
+++ b/src/main/java/io/appium/java_client/android/HasAndroidClipboard.java
@@ -16,10 +16,6 @@
 
 package io.appium.java_client.android;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-import static io.appium.java_client.MobileCommand.SET_CLIPBOARD;
-import static io.appium.java_client.MobileCommand.prepareArguments;
-
 import io.appium.java_client.CommandExecutionHelper;
 import io.appium.java_client.clipboard.ClipboardContentType;
 import io.appium.java_client.clipboard.HasClipboard;
@@ -28,6 +24,10 @@
 import java.util.AbstractMap;
 import java.util.Base64;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+import static io.appium.java_client.MobileCommand.SET_CLIPBOARD;
+import static io.appium.java_client.MobileCommand.prepareArguments;
+
 public interface HasAndroidClipboard extends HasClipboard {
     /**
      * Set the content of device's clipboard.
diff --git a/src/main/java/io/appium/java_client/android/HasAndroidDeviceDetails.java b/src/main/java/io/appium/java_client/android/HasAndroidDeviceDetails.java
index 7984a0b43..66c084480 100644
--- a/src/main/java/io/appium/java_client/android/HasAndroidDeviceDetails.java
+++ b/src/main/java/io/appium/java_client/android/HasAndroidDeviceDetails.java
@@ -1,13 +1,13 @@
 package io.appium.java_client.android;
 
-import static io.appium.java_client.android.AndroidMobileCommandHelper.getDisplayDensityCommand;
-import static io.appium.java_client.android.AndroidMobileCommandHelper.getSystemBarsCommand;
-
 import io.appium.java_client.CommandExecutionHelper;
 import io.appium.java_client.ExecutesMethod;
 
 import java.util.Map;
 
+import static io.appium.java_client.android.AndroidMobileCommandHelper.getDisplayDensityCommand;
+import static io.appium.java_client.android.AndroidMobileCommandHelper.getSystemBarsCommand;
+
 public interface HasAndroidDeviceDetails extends ExecutesMethod {
 
     /**
diff --git a/src/main/java/io/appium/java_client/android/HasSupportedPerformanceDataType.java b/src/main/java/io/appium/java_client/android/HasSupportedPerformanceDataType.java
index f64f87332..3afea7552 100644
--- a/src/main/java/io/appium/java_client/android/HasSupportedPerformanceDataType.java
+++ b/src/main/java/io/appium/java_client/android/HasSupportedPerformanceDataType.java
@@ -1,13 +1,13 @@
 package io.appium.java_client.android;
 
-import static io.appium.java_client.android.AndroidMobileCommandHelper.getPerformanceDataCommand;
-import static io.appium.java_client.android.AndroidMobileCommandHelper.getSupportedPerformanceDataTypesCommand;
-
 import io.appium.java_client.CommandExecutionHelper;
 import io.appium.java_client.ExecutesMethod;
 
 import java.util.List;
 
+import static io.appium.java_client.android.AndroidMobileCommandHelper.getPerformanceDataCommand;
+import static io.appium.java_client.android.AndroidMobileCommandHelper.getSupportedPerformanceDataTypesCommand;
+
 public interface HasSupportedPerformanceDataType extends ExecutesMethod {
 
     /**
diff --git a/src/main/java/io/appium/java_client/android/ListensToLogcatMessages.java b/src/main/java/io/appium/java_client/android/ListensToLogcatMessages.java
index 4fffed837..44cae6765 100644
--- a/src/main/java/io/appium/java_client/android/ListensToLogcatMessages.java
+++ b/src/main/java/io/appium/java_client/android/ListensToLogcatMessages.java
@@ -16,11 +16,7 @@
 
 package io.appium.java_client.android;
 
-import static io.appium.java_client.service.local.AppiumServiceBuilder.DEFAULT_APPIUM_PORT;
-import static org.openqa.selenium.remote.DriverCommand.EXECUTE_SCRIPT;
-
 import com.google.common.collect.ImmutableMap;
-
 import io.appium.java_client.ExecutesMethod;
 import io.appium.java_client.ws.StringWebSocketClient;
 import org.openqa.selenium.remote.RemoteWebDriver;
@@ -30,6 +26,9 @@
 import java.util.Collections;
 import java.util.function.Consumer;
 
+import static io.appium.java_client.service.local.AppiumServiceBuilder.DEFAULT_APPIUM_PORT;
+import static org.openqa.selenium.remote.DriverCommand.EXECUTE_SCRIPT;
+
 public interface ListensToLogcatMessages extends ExecutesMethod {
     StringWebSocketClient getLogcatClient();
 
diff --git a/src/main/java/io/appium/java_client/android/StartsActivity.java b/src/main/java/io/appium/java_client/android/StartsActivity.java
index bd21d9d86..ea4c04ce5 100644
--- a/src/main/java/io/appium/java_client/android/StartsActivity.java
+++ b/src/main/java/io/appium/java_client/android/StartsActivity.java
@@ -16,13 +16,13 @@
 
 package io.appium.java_client.android;
 
+import io.appium.java_client.CommandExecutionHelper;
+import io.appium.java_client.ExecutesMethod;
+
 import static io.appium.java_client.android.AndroidMobileCommandHelper.currentActivityCommand;
 import static io.appium.java_client.android.AndroidMobileCommandHelper.currentPackageCommand;
 import static io.appium.java_client.android.AndroidMobileCommandHelper.startActivityCommand;
 
-import io.appium.java_client.CommandExecutionHelper;
-import io.appium.java_client.ExecutesMethod;
-
 public interface StartsActivity extends ExecutesMethod {
     /**
      * This method should start arbitrary activity during a test. If the activity belongs to
diff --git a/src/main/java/io/appium/java_client/android/SupportsNetworkStateManagement.java b/src/main/java/io/appium/java_client/android/SupportsNetworkStateManagement.java
index df63b6e1a..9100fbb69 100644
--- a/src/main/java/io/appium/java_client/android/SupportsNetworkStateManagement.java
+++ b/src/main/java/io/appium/java_client/android/SupportsNetworkStateManagement.java
@@ -1,12 +1,12 @@
 package io.appium.java_client.android;
 
+import io.appium.java_client.CommandExecutionHelper;
+import io.appium.java_client.ExecutesMethod;
+
 import static io.appium.java_client.android.AndroidMobileCommandHelper.toggleAirplaneCommand;
 import static io.appium.java_client.android.AndroidMobileCommandHelper.toggleDataCommand;
 import static io.appium.java_client.android.AndroidMobileCommandHelper.toggleWifiCommand;
 
-import io.appium.java_client.CommandExecutionHelper;
-import io.appium.java_client.ExecutesMethod;
-
 public interface SupportsNetworkStateManagement extends ExecutesMethod {
 
     /**
diff --git a/src/main/java/io/appium/java_client/android/SupportsSpecialEmulatorCommands.java b/src/main/java/io/appium/java_client/android/SupportsSpecialEmulatorCommands.java
index 9da6dfaec..6baeef8a0 100644
--- a/src/main/java/io/appium/java_client/android/SupportsSpecialEmulatorCommands.java
+++ b/src/main/java/io/appium/java_client/android/SupportsSpecialEmulatorCommands.java
@@ -1,5 +1,8 @@
 package io.appium.java_client.android;
 
+import io.appium.java_client.CommandExecutionHelper;
+import io.appium.java_client.ExecutesMethod;
+
 import static io.appium.java_client.android.AndroidMobileCommandHelper.gsmCallCommand;
 import static io.appium.java_client.android.AndroidMobileCommandHelper.gsmSignalStrengthCommand;
 import static io.appium.java_client.android.AndroidMobileCommandHelper.gsmVoiceCommand;
@@ -8,9 +11,6 @@
 import static io.appium.java_client.android.AndroidMobileCommandHelper.powerCapacityCommand;
 import static io.appium.java_client.android.AndroidMobileCommandHelper.sendSMSCommand;
 
-import io.appium.java_client.CommandExecutionHelper;
-import io.appium.java_client.ExecutesMethod;
-
 public interface SupportsSpecialEmulatorCommands extends ExecutesMethod {
 
     /**
diff --git a/src/main/java/io/appium/java_client/android/appmanagement/AndroidInstallApplicationOptions.java b/src/main/java/io/appium/java_client/android/appmanagement/AndroidInstallApplicationOptions.java
index a6eb8e088..67f2e09db 100644
--- a/src/main/java/io/appium/java_client/android/appmanagement/AndroidInstallApplicationOptions.java
+++ b/src/main/java/io/appium/java_client/android/appmanagement/AndroidInstallApplicationOptions.java
@@ -16,17 +16,16 @@
 
 package io.appium.java_client.android.appmanagement;
 
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static java.util.Optional.ofNullable;
-
 import com.google.common.collect.ImmutableMap;
-
 import io.appium.java_client.appmanagement.BaseInstallApplicationOptions;
 
 import java.time.Duration;
 import java.util.Map;
 
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Optional.ofNullable;
+
 public class AndroidInstallApplicationOptions extends
         BaseInstallApplicationOptions<AndroidInstallApplicationOptions> {
     private Boolean replace;
diff --git a/src/main/java/io/appium/java_client/android/appmanagement/AndroidRemoveApplicationOptions.java b/src/main/java/io/appium/java_client/android/appmanagement/AndroidRemoveApplicationOptions.java
index c09253c51..2a4899f13 100644
--- a/src/main/java/io/appium/java_client/android/appmanagement/AndroidRemoveApplicationOptions.java
+++ b/src/main/java/io/appium/java_client/android/appmanagement/AndroidRemoveApplicationOptions.java
@@ -16,17 +16,16 @@
 
 package io.appium.java_client.android.appmanagement;
 
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static java.util.Optional.ofNullable;
-
 import com.google.common.collect.ImmutableMap;
-
 import io.appium.java_client.appmanagement.BaseRemoveApplicationOptions;
 
 import java.time.Duration;
 import java.util.Map;
 
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Optional.ofNullable;
+
 public class AndroidRemoveApplicationOptions extends
         BaseRemoveApplicationOptions<AndroidRemoveApplicationOptions> {
     private Duration timeout;
diff --git a/src/main/java/io/appium/java_client/android/appmanagement/AndroidTerminateApplicationOptions.java b/src/main/java/io/appium/java_client/android/appmanagement/AndroidTerminateApplicationOptions.java
index 6ad6c83f5..0e11e569d 100644
--- a/src/main/java/io/appium/java_client/android/appmanagement/AndroidTerminateApplicationOptions.java
+++ b/src/main/java/io/appium/java_client/android/appmanagement/AndroidTerminateApplicationOptions.java
@@ -16,17 +16,16 @@
 
 package io.appium.java_client.android.appmanagement;
 
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static java.util.Optional.ofNullable;
-
 import com.google.common.collect.ImmutableMap;
-
 import io.appium.java_client.appmanagement.BaseTerminateApplicationOptions;
 
 import java.time.Duration;
 import java.util.Map;
 
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Optional.ofNullable;
+
 public class AndroidTerminateApplicationOptions extends
         BaseTerminateApplicationOptions<AndroidTerminateApplicationOptions> {
     private Duration timeout;
diff --git a/src/main/java/io/appium/java_client/android/connection/HasNetworkConnection.java b/src/main/java/io/appium/java_client/android/connection/HasNetworkConnection.java
index c17d450a1..7f76340a3 100644
--- a/src/main/java/io/appium/java_client/android/connection/HasNetworkConnection.java
+++ b/src/main/java/io/appium/java_client/android/connection/HasNetworkConnection.java
@@ -16,12 +16,12 @@
 
 package io.appium.java_client.android.connection;
 
-import static io.appium.java_client.android.AndroidMobileCommandHelper.getNetworkConnectionCommand;
-import static io.appium.java_client.android.AndroidMobileCommandHelper.setConnectionCommand;
-
 import io.appium.java_client.CommandExecutionHelper;
 import io.appium.java_client.ExecutesMethod;
 
+import static io.appium.java_client.android.AndroidMobileCommandHelper.getNetworkConnectionCommand;
+import static io.appium.java_client.android.AndroidMobileCommandHelper.setConnectionCommand;
+
 public interface HasNetworkConnection extends ExecutesMethod {
 
     /**
diff --git a/src/main/java/io/appium/java_client/android/nativekey/KeyEvent.java b/src/main/java/io/appium/java_client/android/nativekey/KeyEvent.java
index a8538b629..8bf0a99e2 100644
--- a/src/main/java/io/appium/java_client/android/nativekey/KeyEvent.java
+++ b/src/main/java/io/appium/java_client/android/nativekey/KeyEvent.java
@@ -16,12 +16,12 @@
 
 package io.appium.java_client.android.nativekey;
 
-import static java.util.Optional.ofNullable;
-
 import com.google.common.collect.ImmutableMap;
 
 import java.util.Map;
 
+import static java.util.Optional.ofNullable;
+
 public class KeyEvent {
     private Integer keyCode;
     private Integer metaState;
diff --git a/src/main/java/io/appium/java_client/android/nativekey/PressesKey.java b/src/main/java/io/appium/java_client/android/nativekey/PressesKey.java
index b4c39767c..6c9f36212 100644
--- a/src/main/java/io/appium/java_client/android/nativekey/PressesKey.java
+++ b/src/main/java/io/appium/java_client/android/nativekey/PressesKey.java
@@ -16,14 +16,14 @@
 
 package io.appium.java_client.android.nativekey;
 
-import static io.appium.java_client.MobileCommand.LONG_PRESS_KEY_CODE;
-import static io.appium.java_client.MobileCommand.PRESS_KEY_CODE;
-
 import io.appium.java_client.CommandExecutionHelper;
 import io.appium.java_client.ExecutesMethod;
 
 import java.util.AbstractMap;
 
+import static io.appium.java_client.MobileCommand.LONG_PRESS_KEY_CODE;
+import static io.appium.java_client.MobileCommand.PRESS_KEY_CODE;
+
 public interface PressesKey extends ExecutesMethod {
 
     /**
diff --git a/src/main/java/io/appium/java_client/android/options/EspressoOptions.java b/src/main/java/io/appium/java_client/android/options/EspressoOptions.java
index 0baebf02f..c081be4f9 100644
--- a/src/main/java/io/appium/java_client/android/options/EspressoOptions.java
+++ b/src/main/java/io/appium/java_client/android/options/EspressoOptions.java
@@ -32,13 +32,13 @@
 import io.appium.java_client.android.options.app.SupportsAllowTestPackagesOption;
 import io.appium.java_client.android.options.app.SupportsAndroidInstallTimeoutOption;
 import io.appium.java_client.android.options.app.SupportsAppActivityOption;
-import io.appium.java_client.android.options.app.SupportsIntentOptionsOption;
-import io.appium.java_client.android.options.app.SupportsAppWaitDurationOption;
 import io.appium.java_client.android.options.app.SupportsAppPackageOption;
 import io.appium.java_client.android.options.app.SupportsAppWaitActivityOption;
+import io.appium.java_client.android.options.app.SupportsAppWaitDurationOption;
 import io.appium.java_client.android.options.app.SupportsAppWaitPackageOption;
 import io.appium.java_client.android.options.app.SupportsAutoGrantPermissionsOption;
 import io.appium.java_client.android.options.app.SupportsEnforceAppInstallOption;
+import io.appium.java_client.android.options.app.SupportsIntentOptionsOption;
 import io.appium.java_client.android.options.app.SupportsRemoteAppsCacheLimitOption;
 import io.appium.java_client.android.options.app.SupportsUninstallOtherPackagesOption;
 import io.appium.java_client.android.options.avd.SupportsAvdArgsOption;
diff --git a/src/main/java/io/appium/java_client/android/options/UiAutomator2Options.java b/src/main/java/io/appium/java_client/android/options/UiAutomator2Options.java
index 14eddf9eb..adc161950 100644
--- a/src/main/java/io/appium/java_client/android/options/UiAutomator2Options.java
+++ b/src/main/java/io/appium/java_client/android/options/UiAutomator2Options.java
@@ -31,9 +31,9 @@
 import io.appium.java_client.android.options.app.SupportsAllowTestPackagesOption;
 import io.appium.java_client.android.options.app.SupportsAndroidInstallTimeoutOption;
 import io.appium.java_client.android.options.app.SupportsAppActivityOption;
-import io.appium.java_client.android.options.app.SupportsAppWaitDurationOption;
 import io.appium.java_client.android.options.app.SupportsAppPackageOption;
 import io.appium.java_client.android.options.app.SupportsAppWaitActivityOption;
+import io.appium.java_client.android.options.app.SupportsAppWaitDurationOption;
 import io.appium.java_client.android.options.app.SupportsAppWaitForLaunchOption;
 import io.appium.java_client.android.options.app.SupportsAppWaitPackageOption;
 import io.appium.java_client.android.options.app.SupportsAutoGrantPermissionsOption;
@@ -50,7 +50,6 @@
 import io.appium.java_client.android.options.avd.SupportsAvdOption;
 import io.appium.java_client.android.options.avd.SupportsAvdReadyTimeoutOption;
 import io.appium.java_client.android.options.avd.SupportsGpsEnabledOption;
-import io.appium.java_client.remote.options.SupportsIsHeadlessOption;
 import io.appium.java_client.android.options.avd.SupportsNetworkSpeedOption;
 import io.appium.java_client.android.options.context.SupportsAutoWebviewTimeoutOption;
 import io.appium.java_client.android.options.context.SupportsChromeLoggingPrefsOption;
@@ -78,7 +77,6 @@
 import io.appium.java_client.android.options.mjpeg.SupportsMjpegScreenshotUrlOption;
 import io.appium.java_client.android.options.mjpeg.SupportsMjpegServerPortOption;
 import io.appium.java_client.android.options.other.SupportsDisableSuppressAccessibilityServiceOption;
-import io.appium.java_client.remote.options.SupportsSkipLogCaptureOption;
 import io.appium.java_client.android.options.other.SupportsUserProfileOption;
 import io.appium.java_client.android.options.server.SupportsDisableWindowAnimationOption;
 import io.appium.java_client.android.options.server.SupportsSkipDeviceInitializationOption;
@@ -97,10 +95,12 @@
 import io.appium.java_client.remote.options.SupportsClearSystemFilesOption;
 import io.appium.java_client.remote.options.SupportsDeviceNameOption;
 import io.appium.java_client.remote.options.SupportsEnablePerformanceLoggingOption;
+import io.appium.java_client.remote.options.SupportsIsHeadlessOption;
 import io.appium.java_client.remote.options.SupportsLanguageOption;
 import io.appium.java_client.remote.options.SupportsLocaleOption;
 import io.appium.java_client.remote.options.SupportsOrientationOption;
 import io.appium.java_client.remote.options.SupportsOtherAppsOption;
+import io.appium.java_client.remote.options.SupportsSkipLogCaptureOption;
 import io.appium.java_client.remote.options.SupportsUdidOption;
 import org.openqa.selenium.Capabilities;
 
diff --git a/src/main/java/io/appium/java_client/android/options/app/SupportsAndroidInstallTimeoutOption.java b/src/main/java/io/appium/java_client/android/options/app/SupportsAndroidInstallTimeoutOption.java
index 40a588c2e..ead32780b 100644
--- a/src/main/java/io/appium/java_client/android/options/app/SupportsAndroidInstallTimeoutOption.java
+++ b/src/main/java/io/appium/java_client/android/options/app/SupportsAndroidInstallTimeoutOption.java
@@ -24,8 +24,6 @@
 import java.time.Duration;
 import java.util.Optional;
 
-import static io.appium.java_client.internal.CapabilityHelpers.toDuration;
-
 public interface SupportsAndroidInstallTimeoutOption<T extends BaseOptions<T>> extends
         Capabilities, CanSetCapability<T> {
     String ANDROID_INSTALL_TIMEOUT_OPTION = "androidInstallTimeout";
diff --git a/src/main/java/io/appium/java_client/clipboard/HasClipboard.java b/src/main/java/io/appium/java_client/clipboard/HasClipboard.java
index ca813c4e0..637a35caf 100644
--- a/src/main/java/io/appium/java_client/clipboard/HasClipboard.java
+++ b/src/main/java/io/appium/java_client/clipboard/HasClipboard.java
@@ -16,11 +16,6 @@
 
 package io.appium.java_client.clipboard;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-import static io.appium.java_client.MobileCommand.GET_CLIPBOARD;
-import static io.appium.java_client.MobileCommand.SET_CLIPBOARD;
-import static io.appium.java_client.MobileCommand.prepareArguments;
-
 import io.appium.java_client.CommandExecutionHelper;
 import io.appium.java_client.ExecutesMethod;
 
@@ -28,6 +23,11 @@
 import java.util.AbstractMap;
 import java.util.Base64;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+import static io.appium.java_client.MobileCommand.GET_CLIPBOARD;
+import static io.appium.java_client.MobileCommand.SET_CLIPBOARD;
+import static io.appium.java_client.MobileCommand.prepareArguments;
+
 public interface HasClipboard extends ExecutesMethod {
     /**
      * Set the content of device's clipboard.
diff --git a/src/main/java/io/appium/java_client/imagecomparison/BaseComparisonOptions.java b/src/main/java/io/appium/java_client/imagecomparison/BaseComparisonOptions.java
index 5489b9686..2563055cc 100644
--- a/src/main/java/io/appium/java_client/imagecomparison/BaseComparisonOptions.java
+++ b/src/main/java/io/appium/java_client/imagecomparison/BaseComparisonOptions.java
@@ -16,12 +16,12 @@
 
 package io.appium.java_client.imagecomparison;
 
-import static java.util.Optional.ofNullable;
-
 import com.google.common.collect.ImmutableMap;
 
 import java.util.Map;
 
+import static java.util.Optional.ofNullable;
+
 public abstract class BaseComparisonOptions<T extends BaseComparisonOptions<T>> {
     private Boolean visualize;
 
diff --git a/src/main/java/io/appium/java_client/imagecomparison/ComparisonResult.java b/src/main/java/io/appium/java_client/imagecomparison/ComparisonResult.java
index 1ad0639b3..49e487b59 100644
--- a/src/main/java/io/appium/java_client/imagecomparison/ComparisonResult.java
+++ b/src/main/java/io/appium/java_client/imagecomparison/ComparisonResult.java
@@ -18,7 +18,6 @@
 
 import lombok.AccessLevel;
 import lombok.Getter;
-
 import org.openqa.selenium.Point;
 import org.openqa.selenium.Rectangle;
 
diff --git a/src/main/java/io/appium/java_client/imagecomparison/FeaturesMatchingOptions.java b/src/main/java/io/appium/java_client/imagecomparison/FeaturesMatchingOptions.java
index d4c89161f..5e72c6591 100644
--- a/src/main/java/io/appium/java_client/imagecomparison/FeaturesMatchingOptions.java
+++ b/src/main/java/io/appium/java_client/imagecomparison/FeaturesMatchingOptions.java
@@ -16,13 +16,13 @@
 
 package io.appium.java_client.imagecomparison;
 
-import static com.google.common.base.Preconditions.checkArgument;
-import static java.util.Optional.ofNullable;
-
 import com.google.common.collect.ImmutableMap;
 
 import java.util.Map;
 
+import static com.google.common.base.Preconditions.checkArgument;
+import static java.util.Optional.ofNullable;
+
 public class FeaturesMatchingOptions extends BaseComparisonOptions<FeaturesMatchingOptions> {
     private String detectorName;
     private String matchFunc;
diff --git a/src/main/java/io/appium/java_client/imagecomparison/OccurrenceMatchingOptions.java b/src/main/java/io/appium/java_client/imagecomparison/OccurrenceMatchingOptions.java
index d4a7810e6..818c9f2da 100644
--- a/src/main/java/io/appium/java_client/imagecomparison/OccurrenceMatchingOptions.java
+++ b/src/main/java/io/appium/java_client/imagecomparison/OccurrenceMatchingOptions.java
@@ -16,12 +16,12 @@
 
 package io.appium.java_client.imagecomparison;
 
-import static java.util.Optional.ofNullable;
-
 import com.google.common.collect.ImmutableMap;
 
 import java.util.Map;
 
+import static java.util.Optional.ofNullable;
+
 public class OccurrenceMatchingOptions extends BaseComparisonOptions<OccurrenceMatchingOptions> {
     private Double threshold;
     private Boolean multiple;
diff --git a/src/main/java/io/appium/java_client/ios/HasIOSClipboard.java b/src/main/java/io/appium/java_client/ios/HasIOSClipboard.java
index 538c8cee3..f1dd7300e 100644
--- a/src/main/java/io/appium/java_client/ios/HasIOSClipboard.java
+++ b/src/main/java/io/appium/java_client/ios/HasIOSClipboard.java
@@ -16,11 +16,10 @@
 
 package io.appium.java_client.ios;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import io.appium.java_client.clipboard.ClipboardContentType;
 import io.appium.java_client.clipboard.HasClipboard;
 
+import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -29,7 +28,8 @@
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
-import javax.imageio.ImageIO;
+
+import static com.google.common.base.Preconditions.checkNotNull;
 
 public interface HasIOSClipboard extends HasClipboard {
     /**
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 00098b14c..d450c1b0f 100644
--- a/src/main/java/io/appium/java_client/ios/IOSDriver.java
+++ b/src/main/java/io/appium/java_client/ios/IOSDriver.java
@@ -16,11 +16,7 @@
 
 package io.appium.java_client.ios;
 
-import static io.appium.java_client.MobileCommand.prepareArguments;
-import static org.openqa.selenium.remote.DriverCommand.EXECUTE_SCRIPT;
-
 import com.google.common.collect.ImmutableMap;
-
 import io.appium.java_client.AppiumClientConfig;
 import io.appium.java_client.AppiumDriver;
 import io.appium.java_client.HasAppStrings;
@@ -29,9 +25,9 @@
 import io.appium.java_client.HidesKeyboard;
 import io.appium.java_client.HidesKeyboardWithKeyName;
 import io.appium.java_client.InteractsWithApps;
-import io.appium.java_client.PullsFiles;
 import io.appium.java_client.LocksDevice;
 import io.appium.java_client.PerformsTouchActions;
+import io.appium.java_client.PullsFiles;
 import io.appium.java_client.PushesFiles;
 import io.appium.java_client.SupportsLegacyAppManagement;
 import io.appium.java_client.battery.HasBattery;
@@ -56,6 +52,9 @@
 import java.util.Collections;
 import java.util.Map;
 
+import static io.appium.java_client.MobileCommand.prepareArguments;
+import static org.openqa.selenium.remote.DriverCommand.EXECUTE_SCRIPT;
+
 /**
  * iOS driver implementation.
  */
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 d7f6af6b1..8e61cb5cf 100644
--- a/src/main/java/io/appium/java_client/ios/IOSMobileCommandHelper.java
+++ b/src/main/java/io/appium/java_client/ios/IOSMobileCommandHelper.java
@@ -17,7 +17,6 @@
 package io.appium.java_client.ios;
 
 import com.google.common.collect.ImmutableMap;
-
 import io.appium.java_client.MobileCommand;
 
 import java.util.AbstractMap;
diff --git a/src/main/java/io/appium/java_client/ios/IOSStartScreenRecordingOptions.java b/src/main/java/io/appium/java_client/ios/IOSStartScreenRecordingOptions.java
index d9b918977..a86dabac7 100644
--- a/src/main/java/io/appium/java_client/ios/IOSStartScreenRecordingOptions.java
+++ b/src/main/java/io/appium/java_client/ios/IOSStartScreenRecordingOptions.java
@@ -16,17 +16,16 @@
 
 package io.appium.java_client.ios;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-import static java.util.Optional.ofNullable;
-
 import com.google.common.collect.ImmutableMap;
-
 import io.appium.java_client.screenrecording.BaseStartScreenRecordingOptions;
 import io.appium.java_client.screenrecording.ScreenRecordingUploadOptions;
 
 import java.time.Duration;
 import java.util.Map;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Optional.ofNullable;
+
 public class IOSStartScreenRecordingOptions
         extends BaseStartScreenRecordingOptions<IOSStartScreenRecordingOptions> {
     private String videoType;
diff --git a/src/main/java/io/appium/java_client/ios/ListensToSyslogMessages.java b/src/main/java/io/appium/java_client/ios/ListensToSyslogMessages.java
index 6bb15821c..3341f753d 100644
--- a/src/main/java/io/appium/java_client/ios/ListensToSyslogMessages.java
+++ b/src/main/java/io/appium/java_client/ios/ListensToSyslogMessages.java
@@ -16,11 +16,7 @@
 
 package io.appium.java_client.ios;
 
-import static io.appium.java_client.service.local.AppiumServiceBuilder.DEFAULT_APPIUM_PORT;
-import static org.openqa.selenium.remote.DriverCommand.EXECUTE_SCRIPT;
-
 import com.google.common.collect.ImmutableMap;
-
 import io.appium.java_client.ExecutesMethod;
 import io.appium.java_client.ws.StringWebSocketClient;
 import org.openqa.selenium.remote.RemoteWebDriver;
@@ -30,6 +26,9 @@
 import java.util.Collections;
 import java.util.function.Consumer;
 
+import static io.appium.java_client.service.local.AppiumServiceBuilder.DEFAULT_APPIUM_PORT;
+import static org.openqa.selenium.remote.DriverCommand.EXECUTE_SCRIPT;
+
 public interface ListensToSyslogMessages extends ExecutesMethod {
 
     StringWebSocketClient getSyslogClient();
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 90e088e93..907a86655 100644
--- a/src/main/java/io/appium/java_client/ios/PerformsTouchID.java
+++ b/src/main/java/io/appium/java_client/ios/PerformsTouchID.java
@@ -16,12 +16,12 @@
 
 package io.appium.java_client.ios;
 
-import static io.appium.java_client.ios.IOSMobileCommandHelper.toggleTouchIdEnrollmentCommand;
-import static io.appium.java_client.ios.IOSMobileCommandHelper.touchIdCommand;
-
 import io.appium.java_client.CommandExecutionHelper;
 import io.appium.java_client.ExecutesMethod;
 
+import static io.appium.java_client.ios.IOSMobileCommandHelper.toggleTouchIdEnrollmentCommand;
+import static io.appium.java_client.ios.IOSMobileCommandHelper.touchIdCommand;
+
 public interface PerformsTouchID extends ExecutesMethod {
 
     /**
diff --git a/src/main/java/io/appium/java_client/ios/ShakesDevice.java b/src/main/java/io/appium/java_client/ios/ShakesDevice.java
index 208f05bb1..abd601852 100644
--- a/src/main/java/io/appium/java_client/ios/ShakesDevice.java
+++ b/src/main/java/io/appium/java_client/ios/ShakesDevice.java
@@ -16,11 +16,11 @@
 
 package io.appium.java_client.ios;
 
-import static io.appium.java_client.ios.IOSMobileCommandHelper.shakeCommand;
-
 import io.appium.java_client.CommandExecutionHelper;
 import io.appium.java_client.ExecutesMethod;
 
+import static io.appium.java_client.ios.IOSMobileCommandHelper.shakeCommand;
+
 public interface ShakesDevice extends ExecutesMethod {
 
     /**
diff --git a/src/main/java/io/appium/java_client/ios/touch/IOSPressOptions.java b/src/main/java/io/appium/java_client/ios/touch/IOSPressOptions.java
index 0720bd325..a6b8cdf7f 100644
--- a/src/main/java/io/appium/java_client/ios/touch/IOSPressOptions.java
+++ b/src/main/java/io/appium/java_client/ios/touch/IOSPressOptions.java
@@ -16,12 +16,12 @@
 
 package io.appium.java_client.ios.touch;
 
-import static java.util.Optional.ofNullable;
-
 import io.appium.java_client.touch.offset.AbstractOptionCombinedWithPosition;
 
 import java.util.Map;
 
+import static java.util.Optional.ofNullable;
+
 public class IOSPressOptions extends AbstractOptionCombinedWithPosition<IOSPressOptions> {
     private Double pressure = null;
 
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 69fe8c1e0..63deca31f 100644
--- a/src/main/java/io/appium/java_client/pagefactory/AndroidFindAll.java
+++ b/src/main/java/io/appium/java_client/pagefactory/AndroidFindAll.java
@@ -16,14 +16,14 @@
 
 package io.appium.java_client.pagefactory;
 
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
 import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
 /**
  * Used to mark a field on a Page/Screen Object to indicate that lookup should use a
  * series of {@link AndroidBy} tags
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 25b37c0b6..aa245d971 100644
--- a/src/main/java/io/appium/java_client/pagefactory/AndroidFindBy.java
+++ b/src/main/java/io/appium/java_client/pagefactory/AndroidFindBy.java
@@ -16,14 +16,14 @@
 
 package io.appium.java_client.pagefactory;
 
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
 import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
 
 /**
  * Used to mark a field on a Page Object to indicate an alternative mechanism for locating the
diff --git a/src/main/java/io/appium/java_client/pagefactory/AndroidFindByAllSet.java b/src/main/java/io/appium/java_client/pagefactory/AndroidFindByAllSet.java
index ab6afda28..fed03d755 100644
--- a/src/main/java/io/appium/java_client/pagefactory/AndroidFindByAllSet.java
+++ b/src/main/java/io/appium/java_client/pagefactory/AndroidFindByAllSet.java
@@ -1,12 +1,12 @@
 package io.appium.java_client.pagefactory;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
 /**
  * Defines set of chained/possible locators. Each one locator
  * should be defined with {@link AndroidFindAll}
diff --git a/src/main/java/io/appium/java_client/pagefactory/AndroidFindByChainSet.java b/src/main/java/io/appium/java_client/pagefactory/AndroidFindByChainSet.java
index 365146650..3fda1f27a 100644
--- a/src/main/java/io/appium/java_client/pagefactory/AndroidFindByChainSet.java
+++ b/src/main/java/io/appium/java_client/pagefactory/AndroidFindByChainSet.java
@@ -1,12 +1,12 @@
 package io.appium.java_client.pagefactory;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
 /**
  * Defines set of chained/possible locators. Each one locator
  * should be defined with {@link io.appium.java_client.pagefactory.AndroidFindBys}
diff --git a/src/main/java/io/appium/java_client/pagefactory/AndroidFindBySet.java b/src/main/java/io/appium/java_client/pagefactory/AndroidFindBySet.java
index 6e35ebccd..9b1f62519 100644
--- a/src/main/java/io/appium/java_client/pagefactory/AndroidFindBySet.java
+++ b/src/main/java/io/appium/java_client/pagefactory/AndroidFindBySet.java
@@ -16,13 +16,13 @@
 
 package io.appium.java_client.pagefactory;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
 /**
  * Defines set of chained/possible locators. Each one locator
  * should be defined with {@link io.appium.java_client.pagefactory.AndroidFindBy}
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 eabfeb7c2..db278a9ce 100644
--- a/src/main/java/io/appium/java_client/pagefactory/AndroidFindBys.java
+++ b/src/main/java/io/appium/java_client/pagefactory/AndroidFindBys.java
@@ -16,14 +16,14 @@
 
 package io.appium.java_client.pagefactory;
 
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
 import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
 /**
  * Used to mark a field on a Page Object to indicate that lookup should use
  * a series of {@link io.appium.java_client.pagefactory.AndroidBy} tags.
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 b8b0fbe8f..5208add47 100644
--- a/src/main/java/io/appium/java_client/pagefactory/AppiumElementLocator.java
+++ b/src/main/java/io/appium/java_client/pagefactory/AppiumElementLocator.java
@@ -16,15 +16,8 @@
 
 package io.appium.java_client.pagefactory;
 
-import static io.appium.java_client.pagefactory.ThrowableUtil.extractReadableException;
-import static io.appium.java_client.pagefactory.ThrowableUtil.isInvalidSelectorRootCause;
-import static io.appium.java_client.pagefactory.ThrowableUtil.isStaleElementReferenceException;
-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;
-
 import org.openqa.selenium.By;
 import org.openqa.selenium.NoSuchElementException;
 import org.openqa.selenium.SearchContext;
@@ -40,6 +33,12 @@
 import java.util.function.Function;
 import java.util.function.Supplier;
 
+import static io.appium.java_client.pagefactory.ThrowableUtil.extractReadableException;
+import static io.appium.java_client.pagefactory.ThrowableUtil.isInvalidSelectorRootCause;
+import static io.appium.java_client.pagefactory.ThrowableUtil.isStaleElementReferenceException;
+import static io.appium.java_client.pagefactory.utils.WebDriverUnpackUtility.getCurrentContentType;
+import static java.lang.String.format;
+
 class AppiumElementLocator implements CacheableLocator {
 
     private static final String exceptionMessageIfElementNotFound = "Can't locate an element by this strategy: %s";
diff --git a/src/main/java/io/appium/java_client/pagefactory/AppiumElementLocatorFactory.java b/src/main/java/io/appium/java_client/pagefactory/AppiumElementLocatorFactory.java
index 179ecbcc4..170cffa38 100644
--- a/src/main/java/io/appium/java_client/pagefactory/AppiumElementLocatorFactory.java
+++ b/src/main/java/io/appium/java_client/pagefactory/AppiumElementLocatorFactory.java
@@ -16,19 +16,19 @@
 
 package io.appium.java_client.pagefactory;
 
-import static io.appium.java_client.pagefactory.WithTimeout.DurationBuilder.build;
-import static java.util.Optional.ofNullable;
-
 import io.appium.java_client.pagefactory.bys.builder.AppiumByBuilder;
 import io.appium.java_client.pagefactory.locator.CacheableElementLocatorFactory;
 import io.appium.java_client.pagefactory.locator.CacheableLocator;
 import org.openqa.selenium.By;
 import org.openqa.selenium.SearchContext;
 
+import javax.annotation.Nullable;
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Field;
 import java.time.Duration;
-import javax.annotation.Nullable;
+
+import static io.appium.java_client.pagefactory.WithTimeout.DurationBuilder.build;
+import static java.util.Optional.ofNullable;
 
 public class AppiumElementLocatorFactory implements CacheableElementLocatorFactory {
     private final SearchContext searchContext;
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 ea3b35e5a..8bb282859 100644
--- a/src/main/java/io/appium/java_client/pagefactory/AppiumFieldDecorator.java
+++ b/src/main/java/io/appium/java_client/pagefactory/AppiumFieldDecorator.java
@@ -16,12 +16,7 @@
 
 package io.appium.java_client.pagefactory;
 
-import static io.appium.java_client.pagefactory.utils.ProxyFactory.getEnhancedProxy;
-import static io.appium.java_client.pagefactory.utils.WebDriverUnpackUtility.unpackWebDriverFromSearchContext;
-import static java.time.Duration.ofSeconds;
-
 import com.google.common.collect.ImmutableList;
-
 import io.appium.java_client.internal.CapabilityHelpers;
 import io.appium.java_client.pagefactory.bys.ContentType;
 import io.appium.java_client.pagefactory.locator.CacheableLocator;
@@ -49,6 +44,10 @@
 import java.util.List;
 import java.util.Map;
 
+import static io.appium.java_client.pagefactory.utils.ProxyFactory.getEnhancedProxy;
+import static io.appium.java_client.pagefactory.utils.WebDriverUnpackUtility.unpackWebDriverFromSearchContext;
+import static java.time.Duration.ofSeconds;
+
 /**
  * Default decorator for use with PageFactory. Will decorate 1) all of the
  * WebElement fields and 2) List of WebElement that have
diff --git a/src/main/java/io/appium/java_client/pagefactory/DefaultElementByBuilder.java b/src/main/java/io/appium/java_client/pagefactory/DefaultElementByBuilder.java
index 23445fcf8..512c978cc 100644
--- a/src/main/java/io/appium/java_client/pagefactory/DefaultElementByBuilder.java
+++ b/src/main/java/io/appium/java_client/pagefactory/DefaultElementByBuilder.java
@@ -16,10 +16,6 @@
 
 package io.appium.java_client.pagefactory;
 
-import static java.lang.Integer.signum;
-import static java.util.Arrays.asList;
-import static java.util.Optional.ofNullable;
-
 import io.appium.java_client.pagefactory.bys.ContentMappedBy;
 import io.appium.java_client.pagefactory.bys.ContentType;
 import io.appium.java_client.pagefactory.bys.builder.AppiumByBuilder;
@@ -46,6 +42,10 @@
 import java.util.Map;
 import java.util.Optional;
 
+import static java.lang.Integer.signum;
+import static java.util.Arrays.asList;
+import static java.util.Optional.ofNullable;
+
 public class DefaultElementByBuilder extends AppiumByBuilder {
 
     private static final String PRIORITY = "priority";
diff --git a/src/main/java/io/appium/java_client/pagefactory/ElementInterceptor.java b/src/main/java/io/appium/java_client/pagefactory/ElementInterceptor.java
index 35a703e8a..efe7bd95f 100644
--- a/src/main/java/io/appium/java_client/pagefactory/ElementInterceptor.java
+++ b/src/main/java/io/appium/java_client/pagefactory/ElementInterceptor.java
@@ -16,8 +16,6 @@
 
 package io.appium.java_client.pagefactory;
 
-import static io.appium.java_client.pagefactory.ThrowableUtil.extractReadableException;
-
 import io.appium.java_client.pagefactory.interceptors.InterceptorOfASingleElement;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
@@ -25,6 +23,8 @@
 
 import java.lang.reflect.Method;
 
+import static io.appium.java_client.pagefactory.ThrowableUtil.extractReadableException;
+
 /**
  * Intercepts requests to {@link WebElement}.
  */
diff --git a/src/main/java/io/appium/java_client/pagefactory/ElementListInterceptor.java b/src/main/java/io/appium/java_client/pagefactory/ElementListInterceptor.java
index 5dd385b29..fc7164533 100644
--- a/src/main/java/io/appium/java_client/pagefactory/ElementListInterceptor.java
+++ b/src/main/java/io/appium/java_client/pagefactory/ElementListInterceptor.java
@@ -16,8 +16,6 @@
 
 package io.appium.java_client.pagefactory;
 
-import static io.appium.java_client.pagefactory.ThrowableUtil.extractReadableException;
-
 import io.appium.java_client.pagefactory.interceptors.InterceptorOfAListOfElements;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.pagefactory.ElementLocator;
@@ -25,6 +23,8 @@
 import java.lang.reflect.Method;
 import java.util.List;
 
+import static io.appium.java_client.pagefactory.ThrowableUtil.extractReadableException;
+
 /**
  * Intercepts requests to the list of {@link WebElement}.
  */
diff --git a/src/main/java/io/appium/java_client/pagefactory/OverrideWidgetReader.java b/src/main/java/io/appium/java_client/pagefactory/OverrideWidgetReader.java
index 4060e4fae..be25f1c31 100644
--- a/src/main/java/io/appium/java_client/pagefactory/OverrideWidgetReader.java
+++ b/src/main/java/io/appium/java_client/pagefactory/OverrideWidgetReader.java
@@ -16,13 +16,7 @@
 
 package io.appium.java_client.pagefactory;
 
-import static io.appium.java_client.pagefactory.WidgetConstructorUtil.findConvenientConstructor;
-import static io.appium.java_client.remote.MobilePlatform.ANDROID;
-import static io.appium.java_client.remote.MobilePlatform.IOS;
-import static io.appium.java_client.remote.MobilePlatform.WINDOWS;
-
 import io.appium.java_client.pagefactory.bys.ContentType;
-import io.appium.java_client.remote.AutomationName;
 
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Constructor;
@@ -30,6 +24,11 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import static io.appium.java_client.pagefactory.WidgetConstructorUtil.findConvenientConstructor;
+import static io.appium.java_client.remote.MobilePlatform.ANDROID;
+import static io.appium.java_client.remote.MobilePlatform.IOS;
+import static io.appium.java_client.remote.MobilePlatform.WINDOWS;
+
 class OverrideWidgetReader {
     private static final Class<? extends Widget> EMPTY = Widget.class;
     private static final String HTML = "html";
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 fe8a7f9e3..1b2fdaebe 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,6 @@
 
 package io.appium.java_client.pagefactory;
 
-import static io.appium.java_client.pagefactory.utils.WebDriverUnpackUtility.unpackWebDriverFromSearchContext;
-
 import org.openqa.selenium.By;
 import org.openqa.selenium.SearchContext;
 import org.openqa.selenium.WebDriver;
@@ -27,6 +25,8 @@
 
 import java.util.List;
 
+import static io.appium.java_client.pagefactory.utils.WebDriverUnpackUtility.unpackWebDriverFromSearchContext;
+
 /**
  * It is the Appium-specific extension of the Page Object design pattern. It allows user
  * to create objects which typify some element with nested sub-elements. Also it allows to
diff --git a/src/main/java/io/appium/java_client/pagefactory/WidgetByBuilder.java b/src/main/java/io/appium/java_client/pagefactory/WidgetByBuilder.java
index 4f509598b..905844e4a 100644
--- a/src/main/java/io/appium/java_client/pagefactory/WidgetByBuilder.java
+++ b/src/main/java/io/appium/java_client/pagefactory/WidgetByBuilder.java
@@ -16,10 +16,6 @@
 
 package io.appium.java_client.pagefactory;
 
-import static io.appium.java_client.pagefactory.OverrideWidgetReader.getDefaultOrHTMLWidgetClass;
-import static io.appium.java_client.pagefactory.OverrideWidgetReader.getMobileNativeWidgetClass;
-import static java.util.Optional.ofNullable;
-
 import org.openqa.selenium.By;
 
 import java.lang.reflect.AnnotatedElement;
@@ -28,6 +24,10 @@
 import java.lang.reflect.Type;
 import java.util.List;
 
+import static io.appium.java_client.pagefactory.OverrideWidgetReader.getDefaultOrHTMLWidgetClass;
+import static io.appium.java_client.pagefactory.OverrideWidgetReader.getMobileNativeWidgetClass;
+import static java.util.Optional.ofNullable;
+
 public class WidgetByBuilder extends DefaultElementByBuilder {
 
     public WidgetByBuilder(String platform, String automation) {
diff --git a/src/main/java/io/appium/java_client/pagefactory/WidgetInterceptor.java b/src/main/java/io/appium/java_client/pagefactory/WidgetInterceptor.java
index 747a9eadd..2c3296d35 100644
--- a/src/main/java/io/appium/java_client/pagefactory/WidgetInterceptor.java
+++ b/src/main/java/io/appium/java_client/pagefactory/WidgetInterceptor.java
@@ -16,9 +16,6 @@
 
 package io.appium.java_client.pagefactory;
 
-import static io.appium.java_client.pagefactory.ThrowableUtil.extractReadableException;
-import static io.appium.java_client.pagefactory.utils.WebDriverUnpackUtility.getCurrentContentType;
-
 import io.appium.java_client.pagefactory.bys.ContentType;
 import io.appium.java_client.pagefactory.interceptors.InterceptorOfASingleElement;
 import io.appium.java_client.pagefactory.locator.CacheableLocator;
@@ -34,6 +31,9 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import static io.appium.java_client.pagefactory.ThrowableUtil.extractReadableException;
+import static io.appium.java_client.pagefactory.utils.WebDriverUnpackUtility.getCurrentContentType;
+
 class WidgetInterceptor extends InterceptorOfASingleElement {
 
     private final Map<ContentType, Constructor<? extends Widget>> instantiationMap;
diff --git a/src/main/java/io/appium/java_client/pagefactory/WidgetListInterceptor.java b/src/main/java/io/appium/java_client/pagefactory/WidgetListInterceptor.java
index 580de7fb2..04115aaa9 100644
--- a/src/main/java/io/appium/java_client/pagefactory/WidgetListInterceptor.java
+++ b/src/main/java/io/appium/java_client/pagefactory/WidgetListInterceptor.java
@@ -16,10 +16,6 @@
 
 package io.appium.java_client.pagefactory;
 
-import static io.appium.java_client.pagefactory.ThrowableUtil.extractReadableException;
-import static io.appium.java_client.pagefactory.utils.WebDriverUnpackUtility.getCurrentContentType;
-import static java.util.Optional.ofNullable;
-
 import io.appium.java_client.pagefactory.bys.ContentType;
 import io.appium.java_client.pagefactory.interceptors.InterceptorOfAListOfElements;
 import io.appium.java_client.pagefactory.locator.CacheableLocator;
@@ -34,6 +30,10 @@
 import java.util.List;
 import java.util.Map;
 
+import static io.appium.java_client.pagefactory.ThrowableUtil.extractReadableException;
+import static io.appium.java_client.pagefactory.utils.WebDriverUnpackUtility.getCurrentContentType;
+import static java.util.Optional.ofNullable;
+
 class WidgetListInterceptor extends InterceptorOfAListOfElements {
 
     private final Map<ContentType, Constructor<? extends Widget>> instantiationMap;
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 03be2f654..206c1dd08 100644
--- a/src/main/java/io/appium/java_client/pagefactory/WindowsFindAll.java
+++ b/src/main/java/io/appium/java_client/pagefactory/WindowsFindAll.java
@@ -16,14 +16,14 @@
 
 package io.appium.java_client.pagefactory;
 
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
 import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
 /**
  * Used to mark a field on a Page/Screen Object to indicate that lookup should use a series
  * of {@link WindowsBy} tags
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 9ba86d6c3..2222d0312 100644
--- a/src/main/java/io/appium/java_client/pagefactory/WindowsFindBy.java
+++ b/src/main/java/io/appium/java_client/pagefactory/WindowsFindBy.java
@@ -16,14 +16,14 @@
 
 package io.appium.java_client.pagefactory;
 
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
 import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
 /**
  * Used to mark a field on a Page Object to indicate an alternative mechanism for locating the
  * element or a list of elements. Used in conjunction with
diff --git a/src/main/java/io/appium/java_client/pagefactory/WindowsFindByAllSet.java b/src/main/java/io/appium/java_client/pagefactory/WindowsFindByAllSet.java
index 9a1e2f3cd..31caf953d 100644
--- a/src/main/java/io/appium/java_client/pagefactory/WindowsFindByAllSet.java
+++ b/src/main/java/io/appium/java_client/pagefactory/WindowsFindByAllSet.java
@@ -1,12 +1,12 @@
 package io.appium.java_client.pagefactory;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
 /**
  * Defines set of chained/possible locators. Each one locator
  * should be defined with {@link WindowsFindAll}
diff --git a/src/main/java/io/appium/java_client/pagefactory/WindowsFindByChainSet.java b/src/main/java/io/appium/java_client/pagefactory/WindowsFindByChainSet.java
index 583d0f5d5..b6518ba6a 100644
--- a/src/main/java/io/appium/java_client/pagefactory/WindowsFindByChainSet.java
+++ b/src/main/java/io/appium/java_client/pagefactory/WindowsFindByChainSet.java
@@ -1,12 +1,12 @@
 package io.appium.java_client.pagefactory;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
 /**
  * Defines set of chained/possible locators. Each one locator
  * should be defined with {@link WindowsFindBys}
diff --git a/src/main/java/io/appium/java_client/pagefactory/WindowsFindBySet.java b/src/main/java/io/appium/java_client/pagefactory/WindowsFindBySet.java
index 5efd79322..2f7cda9f4 100644
--- a/src/main/java/io/appium/java_client/pagefactory/WindowsFindBySet.java
+++ b/src/main/java/io/appium/java_client/pagefactory/WindowsFindBySet.java
@@ -16,13 +16,13 @@
 
 package io.appium.java_client.pagefactory;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
 /**
  * Defines set of chained/possible locators. Each one locator
  * should be defined with {@link WindowsFindBy}
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 605986de3..9120a41d6 100644
--- a/src/main/java/io/appium/java_client/pagefactory/WindowsFindBys.java
+++ b/src/main/java/io/appium/java_client/pagefactory/WindowsFindBys.java
@@ -16,14 +16,14 @@
 
 package io.appium.java_client.pagefactory;
 
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
 import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
 /**
  * Used to mark a field on a Page Object to indicate that lookup should use
  * a series of {@link WindowsBy} tags.
diff --git a/src/main/java/io/appium/java_client/pagefactory/bys/ContentMappedBy.java b/src/main/java/io/appium/java_client/pagefactory/bys/ContentMappedBy.java
index 1f995bbe3..fe7edf9b9 100644
--- a/src/main/java/io/appium/java_client/pagefactory/bys/ContentMappedBy.java
+++ b/src/main/java/io/appium/java_client/pagefactory/bys/ContentMappedBy.java
@@ -16,16 +16,16 @@
 
 package io.appium.java_client.pagefactory.bys;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-import static io.appium.java_client.pagefactory.bys.ContentType.NATIVE_MOBILE_SPECIFIC;
-
 import org.openqa.selenium.By;
 import org.openqa.selenium.SearchContext;
 import org.openqa.selenium.WebElement;
 
+import javax.annotation.Nonnull;
 import java.util.List;
 import java.util.Map;
-import javax.annotation.Nonnull;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static io.appium.java_client.pagefactory.bys.ContentType.NATIVE_MOBILE_SPECIFIC;
 
 public class ContentMappedBy extends By {
     private final Map<ContentType, By> map;
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 423645881..330362140 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
@@ -16,12 +16,6 @@
 
 package io.appium.java_client.pagefactory.bys.builder;
 
-import static io.appium.java_client.remote.AutomationName.IOS_XCUI_TEST;
-import static io.appium.java_client.remote.MobilePlatform.ANDROID;
-import static io.appium.java_client.remote.MobilePlatform.IOS;
-import static io.appium.java_client.remote.MobilePlatform.TVOS;
-import static io.appium.java_client.remote.MobilePlatform.WINDOWS;
-
 import org.openqa.selenium.By;
 import org.openqa.selenium.support.pagefactory.AbstractAnnotations;
 import org.openqa.selenium.support.pagefactory.ByAll;
@@ -38,6 +32,12 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static io.appium.java_client.remote.AutomationName.IOS_XCUI_TEST;
+import static io.appium.java_client.remote.MobilePlatform.ANDROID;
+import static io.appium.java_client.remote.MobilePlatform.IOS;
+import static io.appium.java_client.remote.MobilePlatform.TVOS;
+import static io.appium.java_client.remote.MobilePlatform.WINDOWS;
+
 /**
  * It is the basic handler of Appium-specific page object annotations
  * About the Page Object design pattern please read these documents:
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 59015ede7..243d49306 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
@@ -1,8 +1,5 @@
 package io.appium.java_client.pagefactory.bys.builder;
 
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import org.openqa.selenium.By;
 import org.openqa.selenium.NoSuchElementException;
 import org.openqa.selenium.SearchContext;
@@ -13,6 +10,9 @@
 import java.util.Optional;
 import java.util.function.Function;
 
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Mechanism used to locate elements within a document using a series of  lookups. This class will
  * find all DOM elements that matches any of the locators in sequence, e.g.
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 f8d2240cb..9a4196f23 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
@@ -16,8 +16,6 @@
 
 package io.appium.java_client.pagefactory.bys.builder;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import io.appium.java_client.functions.AppiumFunction;
 import org.openqa.selenium.By;
 import org.openqa.selenium.NoSuchElementException;
@@ -28,6 +26,8 @@
 
 import java.util.Optional;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 public class ByChained extends org.openqa.selenium.support.pagefactory.ByChained {
 
     private final By[] bys;
diff --git a/src/main/java/io/appium/java_client/pagefactory/bys/builder/Strategies.java b/src/main/java/io/appium/java_client/pagefactory/bys/builder/Strategies.java
index 6212ffcf7..a353e0257 100644
--- a/src/main/java/io/appium/java_client/pagefactory/bys/builder/Strategies.java
+++ b/src/main/java/io/appium/java_client/pagefactory/bys/builder/Strategies.java
@@ -16,6 +16,12 @@
 
 package io.appium.java_client.pagefactory.bys.builder;
 
+import io.appium.java_client.AppiumBy;
+import io.appium.java_client.MobileBy;
+import io.appium.java_client.pagefactory.AndroidBy;
+import io.appium.java_client.pagefactory.AndroidFindBy;
+import org.openqa.selenium.By;
+
 import java.lang.annotation.Annotation;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -23,13 +29,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.openqa.selenium.By;
-
-import io.appium.java_client.AppiumBy;
-import io.appium.java_client.MobileBy;
-import io.appium.java_client.pagefactory.AndroidBy;
-import io.appium.java_client.pagefactory.AndroidFindBy;
-
 enum Strategies {
     BYUIAUTOMATOR("uiAutomator") {
         @Override By getBy(Annotation annotation) {
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 c388f47d2..94a2241c6 100644
--- a/src/main/java/io/appium/java_client/pagefactory/iOSXCUITFindAll.java
+++ b/src/main/java/io/appium/java_client/pagefactory/iOSXCUITFindAll.java
@@ -16,14 +16,14 @@
 
 package io.appium.java_client.pagefactory;
 
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
 import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
 /**
  * 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.
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 5194e4094..dbc6d23c0 100644
--- a/src/main/java/io/appium/java_client/pagefactory/iOSXCUITFindBy.java
+++ b/src/main/java/io/appium/java_client/pagefactory/iOSXCUITFindBy.java
@@ -16,14 +16,14 @@
 
 package io.appium.java_client.pagefactory;
 
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
 import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
 @Retention(RUNTIME) @Target({FIELD, TYPE})
 @Repeatable(iOSXCUITFindBySet.class)
 public @interface iOSXCUITFindBy {
diff --git a/src/main/java/io/appium/java_client/pagefactory/iOSXCUITFindByAllSet.java b/src/main/java/io/appium/java_client/pagefactory/iOSXCUITFindByAllSet.java
index 0bb769ea7..240efa73d 100644
--- a/src/main/java/io/appium/java_client/pagefactory/iOSXCUITFindByAllSet.java
+++ b/src/main/java/io/appium/java_client/pagefactory/iOSXCUITFindByAllSet.java
@@ -1,12 +1,12 @@
 package io.appium.java_client.pagefactory;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
 /**
  * Defines set of chained/possible locators. Each one locator
  * should be defined with {@link io.appium.java_client.pagefactory.iOSXCUITFindAll}
diff --git a/src/main/java/io/appium/java_client/pagefactory/iOSXCUITFindByChainSet.java b/src/main/java/io/appium/java_client/pagefactory/iOSXCUITFindByChainSet.java
index 2b5fc28de..fcc1a9e87 100644
--- a/src/main/java/io/appium/java_client/pagefactory/iOSXCUITFindByChainSet.java
+++ b/src/main/java/io/appium/java_client/pagefactory/iOSXCUITFindByChainSet.java
@@ -1,12 +1,12 @@
 package io.appium.java_client.pagefactory;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
 /**
  * Defines set of chained/possible locators. Each one locator
  * should be defined with {@link io.appium.java_client.pagefactory.iOSXCUITFindBys}
diff --git a/src/main/java/io/appium/java_client/pagefactory/iOSXCUITFindBySet.java b/src/main/java/io/appium/java_client/pagefactory/iOSXCUITFindBySet.java
index f1fea5a89..ce7464d2a 100644
--- a/src/main/java/io/appium/java_client/pagefactory/iOSXCUITFindBySet.java
+++ b/src/main/java/io/appium/java_client/pagefactory/iOSXCUITFindBySet.java
@@ -16,13 +16,13 @@
 
 package io.appium.java_client.pagefactory;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
 @Retention(RUNTIME) @Target({FIELD, TYPE})
 public @interface iOSXCUITFindBySet {
     /**
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 78a0eba3a..ec8424569 100644
--- a/src/main/java/io/appium/java_client/pagefactory/iOSXCUITFindBys.java
+++ b/src/main/java/io/appium/java_client/pagefactory/iOSXCUITFindBys.java
@@ -16,14 +16,14 @@
 
 package io.appium.java_client.pagefactory;
 
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
 import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
 /**
  * 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.
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 8aa5f7634..e6bb6f6d6 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
@@ -16,11 +16,6 @@
 
 package io.appium.java_client.pagefactory.utils;
 
-import static io.appium.java_client.pagefactory.bys.ContentType.HTML_OR_DEFAULT;
-import static io.appium.java_client.pagefactory.bys.ContentType.NATIVE_MOBILE_SPECIFIC;
-import static java.util.Optional.ofNullable;
-import static org.apache.commons.lang3.StringUtils.containsIgnoreCase;
-
 import io.appium.java_client.HasBrowserCheck;
 import io.appium.java_client.pagefactory.bys.ContentType;
 import org.openqa.selenium.ContextAware;
@@ -29,6 +24,11 @@
 import org.openqa.selenium.WrapsDriver;
 import org.openqa.selenium.WrapsElement;
 
+import static io.appium.java_client.pagefactory.bys.ContentType.HTML_OR_DEFAULT;
+import static io.appium.java_client.pagefactory.bys.ContentType.NATIVE_MOBILE_SPECIFIC;
+import static java.util.Optional.ofNullable;
+import static org.apache.commons.lang3.StringUtils.containsIgnoreCase;
+
 public final class WebDriverUnpackUtility {
     private static final String NATIVE_APP_PATTERN = "NATIVE_APP";
 
diff --git a/src/main/java/io/appium/java_client/remote/AppiumCommandExecutor.java b/src/main/java/io/appium/java_client/remote/AppiumCommandExecutor.java
index 43ce9fc01..b3acea991 100644
--- a/src/main/java/io/appium/java_client/remote/AppiumCommandExecutor.java
+++ b/src/main/java/io/appium/java_client/remote/AppiumCommandExecutor.java
@@ -16,17 +16,11 @@
 
 package io.appium.java_client.remote;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Throwables.throwIfUnchecked;
-import static java.util.Optional.ofNullable;
-import static org.openqa.selenium.remote.DriverCommand.NEW_SESSION;
-
 import com.google.common.base.Supplier;
 import com.google.common.base.Throwables;
-
 import com.google.common.net.HttpHeaders;
-import io.appium.java_client.AppiumUserAgentFilter;
 import io.appium.java_client.AppiumClientConfig;
+import io.appium.java_client.AppiumUserAgentFilter;
 import org.openqa.selenium.SessionNotCreatedException;
 import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.remote.Command;
@@ -56,6 +50,11 @@
 import java.util.Optional;
 import java.util.UUID;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Throwables.throwIfUnchecked;
+import static java.util.Optional.ofNullable;
+import static org.openqa.selenium.remote.DriverCommand.NEW_SESSION;
+
 public class AppiumCommandExecutor extends HttpCommandExecutor {
     // https://github.com/appium/appium-base-driver/pull/400
     private static final String IDEMPOTENCY_KEY_HEADER = "X-Idempotency-Key";
diff --git a/src/main/java/io/appium/java_client/remote/AppiumW3CHttpCommandCodec.java b/src/main/java/io/appium/java_client/remote/AppiumW3CHttpCommandCodec.java
index cd2d6991c..1fc6943a3 100644
--- a/src/main/java/io/appium/java_client/remote/AppiumW3CHttpCommandCodec.java
+++ b/src/main/java/io/appium/java_client/remote/AppiumW3CHttpCommandCodec.java
@@ -16,6 +16,10 @@
 
 package io.appium.java_client.remote;
 
+import org.openqa.selenium.remote.codec.w3c.W3CHttpCommandCodec;
+
+import java.util.Map;
+
 import static org.openqa.selenium.remote.DriverCommand.GET_ELEMENT_ATTRIBUTE;
 import static org.openqa.selenium.remote.DriverCommand.GET_ELEMENT_LOCATION;
 import static org.openqa.selenium.remote.DriverCommand.GET_ELEMENT_LOCATION_ONCE_SCROLLED_INTO_VIEW;
@@ -26,10 +30,6 @@
 import static org.openqa.selenium.remote.DriverCommand.SET_TIMEOUT;
 import static org.openqa.selenium.remote.DriverCommand.SUBMIT_ELEMENT;
 
-import org.openqa.selenium.remote.codec.w3c.W3CHttpCommandCodec;
-
-import java.util.Map;
-
 public class AppiumW3CHttpCommandCodec extends W3CHttpCommandCodec {
     /**
      * This class overrides the built-in Selenium W3C commands codec,
diff --git a/src/main/java/io/appium/java_client/remote/options/SupportsBrowserVersionOption.java b/src/main/java/io/appium/java_client/remote/options/SupportsBrowserVersionOption.java
index 4eece6cdb..0e940b5d6 100644
--- a/src/main/java/io/appium/java_client/remote/options/SupportsBrowserVersionOption.java
+++ b/src/main/java/io/appium/java_client/remote/options/SupportsBrowserVersionOption.java
@@ -18,8 +18,6 @@
 
 import org.openqa.selenium.Capabilities;
 
-import java.util.Optional;
-
 public interface SupportsBrowserVersionOption<T extends BaseOptions<T>> extends
         Capabilities, CanSetCapability<T> {
     String BROWSER_VERSION_OPTION = "browserVersion";
diff --git a/src/main/java/io/appium/java_client/screenrecording/BaseScreenRecordingOptions.java b/src/main/java/io/appium/java_client/screenrecording/BaseScreenRecordingOptions.java
index 127cc29a9..308a9b05a 100644
--- a/src/main/java/io/appium/java_client/screenrecording/BaseScreenRecordingOptions.java
+++ b/src/main/java/io/appium/java_client/screenrecording/BaseScreenRecordingOptions.java
@@ -16,13 +16,13 @@
 
 package io.appium.java_client.screenrecording;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-import static java.util.Optional.ofNullable;
-
 import com.google.common.collect.ImmutableMap;
 
 import java.util.Map;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Optional.ofNullable;
+
 public abstract class BaseScreenRecordingOptions<T extends BaseScreenRecordingOptions<T>> {
     private ScreenRecordingUploadOptions uploadOptions;
 
diff --git a/src/main/java/io/appium/java_client/screenrecording/BaseStartScreenRecordingOptions.java b/src/main/java/io/appium/java_client/screenrecording/BaseStartScreenRecordingOptions.java
index 206cc1a6c..43dff24cc 100644
--- a/src/main/java/io/appium/java_client/screenrecording/BaseStartScreenRecordingOptions.java
+++ b/src/main/java/io/appium/java_client/screenrecording/BaseStartScreenRecordingOptions.java
@@ -16,14 +16,14 @@
 
 package io.appium.java_client.screenrecording;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-import static java.util.Optional.ofNullable;
-
 import com.google.common.collect.ImmutableMap;
 
 import java.time.Duration;
 import java.util.Map;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Optional.ofNullable;
+
 public abstract class BaseStartScreenRecordingOptions<T extends BaseStartScreenRecordingOptions<T>>
         extends BaseScreenRecordingOptions<BaseStartScreenRecordingOptions<T>> {
     private Boolean forceRestart;
diff --git a/src/main/java/io/appium/java_client/screenrecording/CanRecordScreen.java b/src/main/java/io/appium/java_client/screenrecording/CanRecordScreen.java
index cea74c04c..9743edb0a 100644
--- a/src/main/java/io/appium/java_client/screenrecording/CanRecordScreen.java
+++ b/src/main/java/io/appium/java_client/screenrecording/CanRecordScreen.java
@@ -16,14 +16,14 @@
 
 package io.appium.java_client.screenrecording;
 
+import io.appium.java_client.CommandExecutionHelper;
+import io.appium.java_client.ExecutesMethod;
+
 import static io.appium.java_client.MobileCommand.START_RECORDING_SCREEN;
 import static io.appium.java_client.MobileCommand.STOP_RECORDING_SCREEN;
 import static io.appium.java_client.MobileCommand.startRecordingScreenCommand;
 import static io.appium.java_client.MobileCommand.stopRecordingScreenCommand;
 
-import io.appium.java_client.CommandExecutionHelper;
-import io.appium.java_client.ExecutesMethod;
-
 public interface CanRecordScreen extends ExecutesMethod {
 
     /**
diff --git a/src/main/java/io/appium/java_client/screenrecording/ScreenRecordingUploadOptions.java b/src/main/java/io/appium/java_client/screenrecording/ScreenRecordingUploadOptions.java
index 424bfeddd..62509b4eb 100644
--- a/src/main/java/io/appium/java_client/screenrecording/ScreenRecordingUploadOptions.java
+++ b/src/main/java/io/appium/java_client/screenrecording/ScreenRecordingUploadOptions.java
@@ -16,13 +16,13 @@
 
 package io.appium.java_client.screenrecording;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-import static java.util.Optional.ofNullable;
-
 import com.google.common.collect.ImmutableMap;
 
 import java.util.Map;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Optional.ofNullable;
+
 public class ScreenRecordingUploadOptions {
     private String remotePath;
     private String user;
diff --git a/src/main/java/io/appium/java_client/serverevents/ServerEvents.java b/src/main/java/io/appium/java_client/serverevents/ServerEvents.java
index 901241ce5..283aa3b66 100644
--- a/src/main/java/io/appium/java_client/serverevents/ServerEvents.java
+++ b/src/main/java/io/appium/java_client/serverevents/ServerEvents.java
@@ -1,10 +1,11 @@
 package io.appium.java_client.serverevents;
 
+import lombok.Data;
+
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
-import lombok.Data;
 
 @Data
 public class ServerEvents {
diff --git a/src/main/java/io/appium/java_client/serverevents/TimedEvent.java b/src/main/java/io/appium/java_client/serverevents/TimedEvent.java
index dca5f1218..999ecbd39 100644
--- a/src/main/java/io/appium/java_client/serverevents/TimedEvent.java
+++ b/src/main/java/io/appium/java_client/serverevents/TimedEvent.java
@@ -1,8 +1,9 @@
 package io.appium.java_client.serverevents;
 
-import java.util.List;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class TimedEvent {
     public final String name;
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 d4cedc033..62d2a98ce 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
@@ -16,16 +16,9 @@
 
 package io.appium.java_client.service.local;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-import static io.appium.java_client.service.local.AppiumServiceBuilder.BROADCAST_IP_ADDRESS;
-import static org.slf4j.event.Level.DEBUG;
-import static org.slf4j.event.Level.INFO;
-
 import com.google.common.annotations.VisibleForTesting;
-
 import lombok.SneakyThrows;
 import org.apache.commons.lang3.StringUtils;
-
 import org.openqa.selenium.net.UrlChecker;
 import org.openqa.selenium.os.CommandLine;
 import org.openqa.selenium.remote.service.DriverService;
@@ -33,13 +26,13 @@
 import org.slf4j.LoggerFactory;
 import org.slf4j.event.Level;
 
+import javax.annotation.Nullable;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.lang.reflect.Field;
 import java.net.MalformedURLException;
-import java.net.URI;
 import java.net.URL;
 import java.time.Duration;
 import java.util.List;
@@ -52,7 +45,10 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.annotation.Nullable;
+import static com.google.common.base.Preconditions.checkNotNull;
+import static io.appium.java_client.service.local.AppiumServiceBuilder.BROADCAST_IP_ADDRESS;
+import static org.slf4j.event.Level.DEBUG;
+import static org.slf4j.event.Level.INFO;
 
 public final class AppiumDriverLocalService extends DriverService {
 
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 e0ce11520..1e6885c48 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
@@ -16,12 +16,7 @@
 
 package io.appium.java_client.service.local;
 
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static org.openqa.selenium.remote.CapabilityType.PLATFORM_NAME;
-
 import com.google.common.collect.ImmutableList;
-
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import io.appium.java_client.remote.AndroidMobileCapabilityType;
@@ -29,7 +24,6 @@
 import io.appium.java_client.remote.MobileCapabilityType;
 import io.appium.java_client.service.local.flags.GeneralServerFlag;
 import io.appium.java_client.service.local.flags.ServerArgument;
-
 import lombok.SneakyThrows;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -44,7 +38,6 @@
 import javax.annotation.Nullable;
 import java.io.File;
 import java.io.IOException;
-
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -57,6 +50,10 @@
 import java.util.Set;
 import java.util.function.Function;
 
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
+import static org.openqa.selenium.remote.CapabilityType.PLATFORM_NAME;
+
 public final class AppiumServiceBuilder
         extends DriverService.Builder<AppiumDriverLocalService, AppiumServiceBuilder> {
 
diff --git a/src/main/java/io/appium/java_client/touch/LongPressOptions.java b/src/main/java/io/appium/java_client/touch/LongPressOptions.java
index 198f476b5..ac8600b49 100644
--- a/src/main/java/io/appium/java_client/touch/LongPressOptions.java
+++ b/src/main/java/io/appium/java_client/touch/LongPressOptions.java
@@ -16,15 +16,15 @@
 
 package io.appium.java_client.touch;
 
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static java.util.Optional.ofNullable;
-
 import io.appium.java_client.touch.offset.AbstractOptionCombinedWithPosition;
 
 import java.time.Duration;
 import java.util.Map;
 
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Optional.ofNullable;
+
 public class LongPressOptions extends AbstractOptionCombinedWithPosition<LongPressOptions> {
     protected Duration duration = null;
 
diff --git a/src/main/java/io/appium/java_client/touch/TapOptions.java b/src/main/java/io/appium/java_client/touch/TapOptions.java
index 7c4a1e1a0..620df8286 100644
--- a/src/main/java/io/appium/java_client/touch/TapOptions.java
+++ b/src/main/java/io/appium/java_client/touch/TapOptions.java
@@ -16,13 +16,13 @@
 
 package io.appium.java_client.touch;
 
-import static com.google.common.base.Preconditions.checkArgument;
-import static java.util.Optional.ofNullable;
-
 import io.appium.java_client.touch.offset.AbstractOptionCombinedWithPosition;
 
 import java.util.Map;
 
+import static com.google.common.base.Preconditions.checkArgument;
+import static java.util.Optional.ofNullable;
+
 public class TapOptions extends AbstractOptionCombinedWithPosition<TapOptions> {
     private Integer tapsCount = null;
 
diff --git a/src/main/java/io/appium/java_client/touch/WaitOptions.java b/src/main/java/io/appium/java_client/touch/WaitOptions.java
index 422f0b052..81aedd674 100644
--- a/src/main/java/io/appium/java_client/touch/WaitOptions.java
+++ b/src/main/java/io/appium/java_client/touch/WaitOptions.java
@@ -16,13 +16,13 @@
 
 package io.appium.java_client.touch;
 
+import java.time.Duration;
+import java.util.Map;
+
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static java.time.Duration.ofMillis;
 
-import java.time.Duration;
-import java.util.Map;
-
 public class WaitOptions extends ActionOptions<WaitOptions> {
     protected Duration duration = ofMillis(0);
 
diff --git a/src/main/java/io/appium/java_client/touch/offset/AbstractOptionCombinedWithPosition.java b/src/main/java/io/appium/java_client/touch/offset/AbstractOptionCombinedWithPosition.java
index a497ab4a8..d10a05682 100644
--- a/src/main/java/io/appium/java_client/touch/offset/AbstractOptionCombinedWithPosition.java
+++ b/src/main/java/io/appium/java_client/touch/offset/AbstractOptionCombinedWithPosition.java
@@ -1,11 +1,11 @@
 package io.appium.java_client.touch.offset;
 
-import static java.util.Optional.ofNullable;
-
 import io.appium.java_client.touch.ActionOptions;
 
 import java.util.Map;
 
+import static java.util.Optional.ofNullable;
+
 public abstract class AbstractOptionCombinedWithPosition<T extends AbstractOptionCombinedWithPosition<T>>
         extends ActionOptions<AbstractOptionCombinedWithPosition<T>> {
     private ActionOptions<?> positionOption;
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 775b067d1..05b4684a3 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
@@ -1,9 +1,5 @@
 package io.appium.java_client.touch.offset;
 
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static java.util.Optional.ofNullable;
-
 import org.openqa.selenium.Point;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.remote.RemoteWebElement;
@@ -11,6 +7,10 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Optional.ofNullable;
+
 public class ElementOption extends PointOption<ElementOption> {
 
     private String elementId;
diff --git a/src/main/java/io/appium/java_client/touch/offset/PointOption.java b/src/main/java/io/appium/java_client/touch/offset/PointOption.java
index 1cccd2486..9bad51609 100644
--- a/src/main/java/io/appium/java_client/touch/offset/PointOption.java
+++ b/src/main/java/io/appium/java_client/touch/offset/PointOption.java
@@ -1,12 +1,12 @@
 package io.appium.java_client.touch.offset;
 
-import static java.util.Optional.ofNullable;
-
 import io.appium.java_client.touch.ActionOptions;
 import org.openqa.selenium.Point;
 
 import java.util.Map;
 
+import static java.util.Optional.ofNullable;
+
 public class PointOption<T extends PointOption<T>> extends ActionOptions<T> {
 
     protected Point coordinates;
diff --git a/src/main/java/io/appium/java_client/windows/options/SupportsAppArgumentsOption.java b/src/main/java/io/appium/java_client/windows/options/SupportsAppArgumentsOption.java
index e5a8f55c3..1b4465a88 100644
--- a/src/main/java/io/appium/java_client/windows/options/SupportsAppArgumentsOption.java
+++ b/src/main/java/io/appium/java_client/windows/options/SupportsAppArgumentsOption.java
@@ -20,7 +20,6 @@
 import io.appium.java_client.remote.options.CanSetCapability;
 import org.openqa.selenium.Capabilities;
 
-import java.net.URL;
 import java.util.Optional;
 
 public interface SupportsAppArgumentsOption<T extends BaseOptions<T>> extends
diff --git a/src/main/java/io/appium/java_client/ws/StringWebSocketClient.java b/src/main/java/io/appium/java_client/ws/StringWebSocketClient.java
index 6a3148aa2..99f16d8d3 100644
--- a/src/main/java/io/appium/java_client/ws/StringWebSocketClient.java
+++ b/src/main/java/io/appium/java_client/ws/StringWebSocketClient.java
@@ -16,20 +16,19 @@
 
 package io.appium.java_client.ws;
 
-import java.net.URI;
-import java.time.Duration;
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.function.Consumer;
-
-import javax.annotation.Nullable;
-
 import org.openqa.selenium.remote.http.ClientConfig;
 import org.openqa.selenium.remote.http.HttpClient;
 import org.openqa.selenium.remote.http.HttpMethod;
 import org.openqa.selenium.remote.http.HttpRequest;
 import org.openqa.selenium.remote.http.WebSocket;
 
+import javax.annotation.Nullable;
+import java.net.URI;
+import java.time.Duration;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.function.Consumer;
+
 public class StringWebSocketClient implements WebSocket.Listener,
         CanHandleMessages<String>, CanHandleErrors, CanHandleConnects, CanHandleDisconnects {
     private final List<Consumer<String>> messageHandlers = new CopyOnWriteArrayList<>();
diff --git a/src/test/java/io/appium/java_client/android/AndroidAbilityToUseSupplierTest.java b/src/test/java/io/appium/java_client/android/AndroidAbilityToUseSupplierTest.java
index 38fa40b93..1a0cd129e 100644
--- a/src/test/java/io/appium/java_client/android/AndroidAbilityToUseSupplierTest.java
+++ b/src/test/java/io/appium/java_client/android/AndroidAbilityToUseSupplierTest.java
@@ -1,11 +1,5 @@
 package io.appium.java_client.android;
 
-import static io.appium.java_client.TestUtils.getCenter;
-import static io.appium.java_client.touch.WaitOptions.waitOptions;
-import static io.appium.java_client.touch.offset.ElementOption.element;
-import static java.time.Duration.ofSeconds;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-
 import io.appium.java_client.AppiumBy;
 import io.appium.java_client.functions.ActionSupplier;
 import io.appium.java_client.touch.offset.ElementOption;
@@ -16,6 +10,12 @@
 
 import java.util.List;
 
+import static io.appium.java_client.TestUtils.getCenter;
+import static io.appium.java_client.touch.WaitOptions.waitOptions;
+import static io.appium.java_client.touch.offset.ElementOption.element;
+import static java.time.Duration.ofSeconds;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+
 public class AndroidAbilityToUseSupplierTest extends BaseAndroidTest {
 
     private final ActionSupplier<AndroidTouchAction> horizontalSwipe = () -> {
diff --git a/src/test/java/io/appium/java_client/android/AndroidActivityTest.java b/src/test/java/io/appium/java_client/android/AndroidActivityTest.java
index 86377ac11..149a393c4 100644
--- a/src/test/java/io/appium/java_client/android/AndroidActivityTest.java
+++ b/src/test/java/io/appium/java_client/android/AndroidActivityTest.java
@@ -16,13 +16,13 @@
 
 package io.appium.java_client.android;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 import io.appium.java_client.android.nativekey.AndroidKey;
 import io.appium.java_client.android.nativekey.KeyEvent;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class AndroidActivityTest extends BaseAndroidTest {
 
     @BeforeEach public void setUp() {
diff --git a/src/test/java/io/appium/java_client/android/AndroidAppStringsTest.java b/src/test/java/io/appium/java_client/android/AndroidAppStringsTest.java
index 9aaeb88b3..e3fefd9b0 100644
--- a/src/test/java/io/appium/java_client/android/AndroidAppStringsTest.java
+++ b/src/test/java/io/appium/java_client/android/AndroidAppStringsTest.java
@@ -16,10 +16,10 @@
 
 package io.appium.java_client.android;
 
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+
 public class AndroidAppStringsTest extends BaseAndroidTest {
 
     @Test public void getAppStrings() {
diff --git a/src/test/java/io/appium/java_client/android/AndroidConnectionTest.java b/src/test/java/io/appium/java_client/android/AndroidConnectionTest.java
index 88e1c1d6e..4c8f03cd4 100644
--- a/src/test/java/io/appium/java_client/android/AndroidConnectionTest.java
+++ b/src/test/java/io/appium/java_client/android/AndroidConnectionTest.java
@@ -16,15 +16,15 @@
 
 package io.appium.java_client.android;
 
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 import io.appium.java_client.android.connection.ConnectionState;
 import io.appium.java_client.android.connection.ConnectionStateBuilder;
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
 
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 @TestMethodOrder(MethodOrderer.MethodName.class)
 public class AndroidConnectionTest extends BaseAndroidTest {
 
diff --git a/src/test/java/io/appium/java_client/android/AndroidContextTest.java b/src/test/java/io/appium/java_client/android/AndroidContextTest.java
index ed832f9e3..53a90f1dd 100644
--- a/src/test/java/io/appium/java_client/android/AndroidContextTest.java
+++ b/src/test/java/io/appium/java_client/android/AndroidContextTest.java
@@ -16,13 +16,13 @@
 
 package io.appium.java_client.android;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
 import io.appium.java_client.NoSuchContextException;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 public class AndroidContextTest extends BaseAndroidTest {
 
     @BeforeAll public static void beforeClass2() throws Exception {
diff --git a/src/test/java/io/appium/java_client/android/AndroidDriverTest.java b/src/test/java/io/appium/java_client/android/AndroidDriverTest.java
index f2e502781..aa2434d50 100644
--- a/src/test/java/io/appium/java_client/android/AndroidDriverTest.java
+++ b/src/test/java/io/appium/java_client/android/AndroidDriverTest.java
@@ -16,16 +16,6 @@
 
 package io.appium.java_client.android;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.lessThan;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
-
 import io.appium.java_client.appmanagement.ApplicationState;
 import org.apache.commons.io.FileUtils;
 import org.hamcrest.Matchers;
@@ -39,6 +29,16 @@
 import java.util.Base64;
 import java.util.List;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.lessThan;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
 public class AndroidDriverTest extends BaseAndroidTest {
 
     @Test
diff --git a/src/test/java/io/appium/java_client/android/AndroidElementTest.java b/src/test/java/io/appium/java_client/android/AndroidElementTest.java
index 8ce9fd2fc..acb4d4dd2 100644
--- a/src/test/java/io/appium/java_client/android/AndroidElementTest.java
+++ b/src/test/java/io/appium/java_client/android/AndroidElementTest.java
@@ -16,10 +16,6 @@
 
 package io.appium.java_client.android;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
 import io.appium.java_client.AppiumBy;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -27,6 +23,10 @@
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.remote.RemoteWebElement;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 public class AndroidElementTest extends BaseAndroidTest {
 
     @BeforeEach public void setup() {
diff --git a/src/test/java/io/appium/java_client/android/AndroidFunctionTest.java b/src/test/java/io/appium/java_client/android/AndroidFunctionTest.java
index 3b915eae1..79a0d8870 100644
--- a/src/test/java/io/appium/java_client/android/AndroidFunctionTest.java
+++ b/src/test/java/io/appium/java_client/android/AndroidFunctionTest.java
@@ -1,12 +1,5 @@
 package io.appium.java_client.android;
 
-import static java.time.Duration.ofMillis;
-import static java.time.Duration.ofSeconds;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.Is.is;
-import static org.hamcrest.core.StringContains.containsString;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
 import io.appium.java_client.functions.AppiumFunction;
 import io.appium.java_client.functions.ExpectedCondition;
 import org.junit.jupiter.api.BeforeAll;
@@ -25,6 +18,13 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import static java.time.Duration.ofMillis;
+import static java.time.Duration.ofSeconds;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.StringContains.containsString;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 public class AndroidFunctionTest extends BaseAndroidTest {
 
     private final AppiumFunction<WebDriver, List<WebElement>> searchingFunction = input -> {
diff --git a/src/test/java/io/appium/java_client/android/AndroidLogcatListenerTest.java b/src/test/java/io/appium/java_client/android/AndroidLogcatListenerTest.java
index f1045c8cf..e7a40383c 100644
--- a/src/test/java/io/appium/java_client/android/AndroidLogcatListenerTest.java
+++ b/src/test/java/io/appium/java_client/android/AndroidLogcatListenerTest.java
@@ -1,7 +1,5 @@
 package io.appium.java_client.android;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 import org.apache.commons.lang3.time.DurationFormatUtils;
 import org.junit.jupiter.api.Test;
 
@@ -9,6 +7,8 @@
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 public class AndroidLogcatListenerTest extends BaseAndroidTest {
 
     @Test
diff --git a/src/test/java/io/appium/java_client/android/AndroidScreenRecordTest.java b/src/test/java/io/appium/java_client/android/AndroidScreenRecordTest.java
index 63510fc26..b0ec3a1e7 100644
--- a/src/test/java/io/appium/java_client/android/AndroidScreenRecordTest.java
+++ b/src/test/java/io/appium/java_client/android/AndroidScreenRecordTest.java
@@ -1,16 +1,16 @@
 package io.appium.java_client.android;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.emptyString;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.not;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.WebDriverException;
 
 import java.time.Duration;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.emptyString;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
+
 public class AndroidScreenRecordTest extends BaseAndroidTest {
 
     @BeforeEach
diff --git a/src/test/java/io/appium/java_client/android/AndroidSearchingTest.java b/src/test/java/io/appium/java_client/android/AndroidSearchingTest.java
index 262b50c61..c9b06c49f 100644
--- a/src/test/java/io/appium/java_client/android/AndroidSearchingTest.java
+++ b/src/test/java/io/appium/java_client/android/AndroidSearchingTest.java
@@ -16,16 +16,16 @@
 
 package io.appium.java_client.android;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
 import io.appium.java_client.AppiumBy;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 public class AndroidSearchingTest extends BaseAndroidTest {
 
     @BeforeEach
diff --git a/src/test/java/io/appium/java_client/android/AndroidTouchTest.java b/src/test/java/io/appium/java_client/android/AndroidTouchTest.java
index 958da3140..f3c9c0394 100644
--- a/src/test/java/io/appium/java_client/android/AndroidTouchTest.java
+++ b/src/test/java/io/appium/java_client/android/AndroidTouchTest.java
@@ -1,19 +1,8 @@
 package io.appium.java_client.android;
 
-import static io.appium.java_client.TestUtils.getCenter;
-import static io.appium.java_client.touch.LongPressOptions.longPressOptions;
-import static io.appium.java_client.touch.TapOptions.tapOptions;
-import static io.appium.java_client.touch.WaitOptions.waitOptions;
-import static io.appium.java_client.touch.offset.ElementOption.element;
-import static io.appium.java_client.touch.offset.PointOption.point;
-import static java.time.Duration.ofSeconds;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-
 import io.appium.java_client.AppiumBy;
 import io.appium.java_client.MultiTouchAction;
 import io.appium.java_client.TouchAction;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.By;
@@ -22,6 +11,16 @@
 
 import java.util.List;
 
+import static io.appium.java_client.TestUtils.getCenter;
+import static io.appium.java_client.touch.LongPressOptions.longPressOptions;
+import static io.appium.java_client.touch.TapOptions.tapOptions;
+import static io.appium.java_client.touch.WaitOptions.waitOptions;
+import static io.appium.java_client.touch.offset.ElementOption.element;
+import static io.appium.java_client.touch.offset.PointOption.point;
+import static java.time.Duration.ofSeconds;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+
 public class AndroidTouchTest extends BaseAndroidTest {
 
     @BeforeEach
diff --git a/src/test/java/io/appium/java_client/android/BaseAndroidTest.java b/src/test/java/io/appium/java_client/android/BaseAndroidTest.java
index 3e75fe6f1..d5eb6840f 100644
--- a/src/test/java/io/appium/java_client/android/BaseAndroidTest.java
+++ b/src/test/java/io/appium/java_client/android/BaseAndroidTest.java
@@ -18,7 +18,6 @@
 
 import io.appium.java_client.android.options.UiAutomator2Options;
 import io.appium.java_client.service.local.AppiumDriverLocalService;
-
 import io.appium.java_client.service.local.AppiumServiceBuilder;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
diff --git a/src/test/java/io/appium/java_client/android/BatteryTest.java b/src/test/java/io/appium/java_client/android/BatteryTest.java
index 619fafac1..ae9fc9e26 100644
--- a/src/test/java/io/appium/java_client/android/BatteryTest.java
+++ b/src/test/java/io/appium/java_client/android/BatteryTest.java
@@ -16,13 +16,13 @@
 
 package io.appium.java_client.android;
 
+import org.junit.jupiter.api.Test;
+
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.greaterThan;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
 
-import org.junit.jupiter.api.Test;
-
 public class BatteryTest extends BaseAndroidTest {
 
     @Test public void veryGettingBatteryInformation() {
diff --git a/src/test/java/io/appium/java_client/android/ClipboardTest.java b/src/test/java/io/appium/java_client/android/ClipboardTest.java
index cf9ee8581..353d9a579 100644
--- a/src/test/java/io/appium/java_client/android/ClipboardTest.java
+++ b/src/test/java/io/appium/java_client/android/ClipboardTest.java
@@ -16,11 +16,11 @@
 
 package io.appium.java_client.android;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class ClipboardTest extends BaseAndroidTest {
 
     @BeforeEach public void setUp() {
diff --git a/src/test/java/io/appium/java_client/android/ExecuteCDPCommandTest.java b/src/test/java/io/appium/java_client/android/ExecuteCDPCommandTest.java
index fc1a138c6..259dd0d4d 100644
--- a/src/test/java/io/appium/java_client/android/ExecuteCDPCommandTest.java
+++ b/src/test/java/io/appium/java_client/android/ExecuteCDPCommandTest.java
@@ -26,7 +26,6 @@
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.remote.DesiredCapabilities;
-import org.openqa.selenium.remote.RemoteWebElement;
 import org.openqa.selenium.support.FindBy;
 import org.openqa.selenium.support.PageFactory;
 
diff --git a/src/test/java/io/appium/java_client/android/FingerPrintTest.java b/src/test/java/io/appium/java_client/android/FingerPrintTest.java
index a32c482fe..4f1e17551 100644
--- a/src/test/java/io/appium/java_client/android/FingerPrintTest.java
+++ b/src/test/java/io/appium/java_client/android/FingerPrintTest.java
@@ -16,8 +16,6 @@
 
 package io.appium.java_client.android;
 
-import static io.appium.java_client.AppiumBy.androidUIAutomator;
-
 import io.appium.java_client.android.options.UiAutomator2Options;
 import io.appium.java_client.service.local.AppiumDriverLocalService;
 import org.junit.jupiter.api.AfterAll;
@@ -32,6 +30,8 @@
 
 import java.time.Duration;
 
+import static io.appium.java_client.AppiumBy.androidUIAutomator;
+
 public class FingerPrintTest {
     private static AppiumDriverLocalService service;
     private static AndroidDriver driver;
diff --git a/src/test/java/io/appium/java_client/android/ImagesComparisonTest.java b/src/test/java/io/appium/java_client/android/ImagesComparisonTest.java
index e49463b87..3632bfbf8 100644
--- a/src/test/java/io/appium/java_client/android/ImagesComparisonTest.java
+++ b/src/test/java/io/appium/java_client/android/ImagesComparisonTest.java
@@ -16,14 +16,6 @@
 
 package io.appium.java_client.android;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.greaterThan;
-import static org.hamcrest.core.Is.is;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
-import java.util.Base64;
-
 import io.appium.java_client.imagecomparison.FeatureDetector;
 import io.appium.java_client.imagecomparison.FeaturesMatchingOptions;
 import io.appium.java_client.imagecomparison.FeaturesMatchingResult;
@@ -35,6 +27,14 @@
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.OutputType;
 
+import java.util.Base64;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.core.Is.is;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 public class ImagesComparisonTest extends BaseAndroidTest {
 
     @Test
diff --git a/src/test/java/io/appium/java_client/android/IntentTest.java b/src/test/java/io/appium/java_client/android/IntentTest.java
index a25e6a0bf..ba4888821 100644
--- a/src/test/java/io/appium/java_client/android/IntentTest.java
+++ b/src/test/java/io/appium/java_client/android/IntentTest.java
@@ -1,9 +1,5 @@
 package io.appium.java_client.android;
 
-import static io.appium.java_client.TestResources.intentExampleApk;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 import io.appium.java_client.android.options.UiAutomator2Options;
 import io.appium.java_client.service.local.AppiumDriverLocalService;
 import org.junit.jupiter.api.AfterAll;
@@ -13,6 +9,10 @@
 
 import java.util.function.Predicate;
 
+import static io.appium.java_client.TestResources.intentExampleApk;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 public class IntentTest {
     private static AppiumDriverLocalService service;
     protected static AndroidDriver driver;
diff --git a/src/test/java/io/appium/java_client/android/KeyCodeTest.java b/src/test/java/io/appium/java_client/android/KeyCodeTest.java
index 7a3ae47e3..7c50f4ceb 100644
--- a/src/test/java/io/appium/java_client/android/KeyCodeTest.java
+++ b/src/test/java/io/appium/java_client/android/KeyCodeTest.java
@@ -16,10 +16,6 @@
 
 package io.appium.java_client.android;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsString;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 import io.appium.java_client.android.nativekey.AndroidKey;
 import io.appium.java_client.android.nativekey.KeyEvent;
 import io.appium.java_client.android.nativekey.KeyEventFlag;
@@ -28,6 +24,10 @@
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.By;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 public class KeyCodeTest extends BaseAndroidTest {
     private static final By PRESS_RESULT_VIEW = By.id("io.appium.android.apis:id/text");
 
diff --git a/src/test/java/io/appium/java_client/android/LogEventTest.java b/src/test/java/io/appium/java_client/android/LogEventTest.java
index a473fbe32..ea820fa94 100644
--- a/src/test/java/io/appium/java_client/android/LogEventTest.java
+++ b/src/test/java/io/appium/java_client/android/LogEventTest.java
@@ -16,16 +16,16 @@
 
 package io.appium.java_client.android;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 import io.appium.java_client.serverevents.CommandEvent;
 import io.appium.java_client.serverevents.CustomEvent;
-import io.appium.java_client.serverevents.TimedEvent;
 import io.appium.java_client.serverevents.ServerEvents;
+import io.appium.java_client.serverevents.TimedEvent;
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Test;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 public class LogEventTest extends BaseAndroidTest {
 
     @Test
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 e29e92c45..bfb4e576a 100644
--- a/src/test/java/io/appium/java_client/android/OpenNotificationsTest.java
+++ b/src/test/java/io/appium/java_client/android/OpenNotificationsTest.java
@@ -1,8 +1,5 @@
 package io.appium.java_client.android;
 
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.openqa.selenium.By.xpath;
-
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.ui.WebDriverWait;
@@ -10,6 +7,9 @@
 import java.time.Duration;
 import java.util.List;
 
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.openqa.selenium.By.xpath;
+
 public class OpenNotificationsTest extends BaseAndroidTest {
     @Test
     public void openNotification() {
diff --git a/src/test/java/io/appium/java_client/android/UIAutomator2Test.java b/src/test/java/io/appium/java_client/android/UIAutomator2Test.java
index 6c2bf0857..0d9da052d 100644
--- a/src/test/java/io/appium/java_client/android/UIAutomator2Test.java
+++ b/src/test/java/io/appium/java_client/android/UIAutomator2Test.java
@@ -1,8 +1,5 @@
 package io.appium.java_client.android;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
 import io.appium.java_client.AppiumBy;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Disabled;
@@ -15,6 +12,9 @@
 
 import java.time.Duration;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 public class UIAutomator2Test extends BaseAndroidTest {
 
     @AfterEach
diff --git a/src/test/java/io/appium/java_client/events/stubs/StubWebElement.java b/src/test/java/io/appium/java_client/events/stubs/StubWebElement.java
index 4be313211..5a50dc58a 100644
--- a/src/test/java/io/appium/java_client/events/stubs/StubWebElement.java
+++ b/src/test/java/io/appium/java_client/events/stubs/StubWebElement.java
@@ -17,8 +17,6 @@
 package io.appium.java_client.events.stubs;
 
 import com.google.common.collect.ImmutableList;
-import java.util.ArrayList;
-import java.util.List;
 import org.openqa.selenium.By;
 import org.openqa.selenium.Dimension;
 import org.openqa.selenium.OutputType;
@@ -27,6 +25,9 @@
 import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.WebElement;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class StubWebElement implements WebElement {
     public StubWebElement() {
     }
diff --git a/src/test/java/io/appium/java_client/internal/AppiumUserAgentFilterTest.java b/src/test/java/io/appium/java_client/internal/AppiumUserAgentFilterTest.java
index 10e33a1ee..7b1eec03a 100644
--- a/src/test/java/io/appium/java_client/internal/AppiumUserAgentFilterTest.java
+++ b/src/test/java/io/appium/java_client/internal/AppiumUserAgentFilterTest.java
@@ -8,7 +8,8 @@
 
 import java.util.stream.Stream;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class AppiumUserAgentFilterTest {
     @Test
diff --git a/src/test/java/io/appium/java_client/internal/ConfigTest.java b/src/test/java/io/appium/java_client/internal/ConfigTest.java
index 67518eca7..46651eac6 100644
--- a/src/test/java/io/appium/java_client/internal/ConfigTest.java
+++ b/src/test/java/io/appium/java_client/internal/ConfigTest.java
@@ -1,19 +1,15 @@
 package io.appium.java_client.internal;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.greaterThan;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 import io.appium.java_client.AppiumUserAgentFilter;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
 import org.junit.jupiter.params.provider.ValueSource;
 
-import java.util.stream.Stream;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.greaterThan;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class ConfigTest {
     private static final String SELENIUM_EXISTING_KEY = "selenium.version";
diff --git a/src/test/java/io/appium/java_client/internal/DirectConnectTest.java b/src/test/java/io/appium/java_client/internal/DirectConnectTest.java
index 93b345474..8255c3c5d 100644
--- a/src/test/java/io/appium/java_client/internal/DirectConnectTest.java
+++ b/src/test/java/io/appium/java_client/internal/DirectConnectTest.java
@@ -7,7 +7,10 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrowsExactly;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class DirectConnectTest {
 
diff --git a/src/test/java/io/appium/java_client/ios/ClipboardTest.java b/src/test/java/io/appium/java_client/ios/ClipboardTest.java
index af6b8a51d..b8ed26a44 100644
--- a/src/test/java/io/appium/java_client/ios/ClipboardTest.java
+++ b/src/test/java/io/appium/java_client/ios/ClipboardTest.java
@@ -16,10 +16,10 @@
 
 package io.appium.java_client.ios;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class ClipboardTest extends AppIOSTest {
 
     @Test public void verifySetAndGetClipboardText() {
diff --git a/src/test/java/io/appium/java_client/ios/IOSAlertTest.java b/src/test/java/io/appium/java_client/ios/IOSAlertTest.java
index 3c731e007..7e1fb6528 100644
--- a/src/test/java/io/appium/java_client/ios/IOSAlertTest.java
+++ b/src/test/java/io/appium/java_client/ios/IOSAlertTest.java
@@ -16,10 +16,6 @@
 
 package io.appium.java_client.ios;
 
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.openqa.selenium.support.ui.ExpectedConditions.alertIsPresent;
-
 import io.appium.java_client.AppiumBy;
 import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.AfterEach;
@@ -33,6 +29,10 @@
 import java.time.Duration;
 import java.util.function.Supplier;
 
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.openqa.selenium.support.ui.ExpectedConditions.alertIsPresent;
+
 @TestMethodOrder(MethodOrderer.MethodName.class)
 public class IOSAlertTest extends AppIOSTest {
 
diff --git a/src/test/java/io/appium/java_client/ios/IOSAppStringsTest.java b/src/test/java/io/appium/java_client/ios/IOSAppStringsTest.java
index 6080737f8..dc552dc91 100644
--- a/src/test/java/io/appium/java_client/ios/IOSAppStringsTest.java
+++ b/src/test/java/io/appium/java_client/ios/IOSAppStringsTest.java
@@ -16,10 +16,10 @@
 
 package io.appium.java_client.ios;
 
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+
 public class IOSAppStringsTest extends AppIOSTest {
 
     @Test public void getAppStrings() {
diff --git a/src/test/java/io/appium/java_client/ios/IOSContextTest.java b/src/test/java/io/appium/java_client/ios/IOSContextTest.java
index 5c51aa677..f2ac548b1 100644
--- a/src/test/java/io/appium/java_client/ios/IOSContextTest.java
+++ b/src/test/java/io/appium/java_client/ios/IOSContextTest.java
@@ -16,14 +16,14 @@
 
 package io.appium.java_client.ios;
 
+import io.appium.java_client.NoSuchContextException;
+import org.junit.jupiter.api.Test;
+
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.StringContains.containsString;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-import io.appium.java_client.NoSuchContextException;
-import org.junit.jupiter.api.Test;
-
 public class IOSContextTest extends BaseIOSWebViewTest {
 
     @Test public void testGetContext() {
diff --git a/src/test/java/io/appium/java_client/ios/IOSDriverTest.java b/src/test/java/io/appium/java_client/ios/IOSDriverTest.java
index bcfd41d7d..ba62dcf34 100644
--- a/src/test/java/io/appium/java_client/ios/IOSDriverTest.java
+++ b/src/test/java/io/appium/java_client/ios/IOSDriverTest.java
@@ -16,15 +16,6 @@
 
 package io.appium.java_client.ios;
 
-import static io.appium.java_client.TestUtils.waitUntilTrue;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.greaterThan;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
-
 import com.google.common.collect.ImmutableMap;
 import io.appium.java_client.appmanagement.ApplicationState;
 import io.appium.java_client.remote.HideKeyboardStrategy;
@@ -43,6 +34,15 @@
 
 import java.time.Duration;
 
+import static io.appium.java_client.TestUtils.waitUntilTrue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.greaterThan;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
 public class IOSDriverTest extends AppIOSTest {
     @BeforeEach
     public void setupEach() {
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 18db02e2b..5d3d943a5 100644
--- a/src/test/java/io/appium/java_client/ios/IOSElementTest.java
+++ b/src/test/java/io/appium/java_client/ios/IOSElementTest.java
@@ -1,10 +1,6 @@
 package io.appium.java_client.ios;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.Is.is;
-import static org.hamcrest.core.IsNot.not;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
+import io.appium.java_client.AppiumBy;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.Test;
@@ -12,10 +8,13 @@
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.ui.WebDriverWait;
 
-import io.appium.java_client.AppiumBy;
-
 import java.time.Duration;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.IsNot.not;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 @TestMethodOrder(MethodOrderer.MethodName.class)
 public class IOSElementTest extends AppIOSTest {
 
diff --git a/src/test/java/io/appium/java_client/ios/IOSNativeWebTapSettingTest.java b/src/test/java/io/appium/java_client/ios/IOSNativeWebTapSettingTest.java
index e4d27f327..922dbb7cd 100644
--- a/src/test/java/io/appium/java_client/ios/IOSNativeWebTapSettingTest.java
+++ b/src/test/java/io/appium/java_client/ios/IOSNativeWebTapSettingTest.java
@@ -1,9 +1,5 @@
 package io.appium.java_client.ios;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import java.time.Duration;
-
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.By;
@@ -11,6 +7,10 @@
 import org.openqa.selenium.support.ui.ExpectedConditions;
 import org.openqa.selenium.support.ui.WebDriverWait;
 
+import java.time.Duration;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 public class IOSNativeWebTapSettingTest extends BaseSafariTest {
 
     @Test
diff --git a/src/test/java/io/appium/java_client/ios/IOSScreenRecordTest.java b/src/test/java/io/appium/java_client/ios/IOSScreenRecordTest.java
index cf88b7b4a..170ea9b6a 100644
--- a/src/test/java/io/appium/java_client/ios/IOSScreenRecordTest.java
+++ b/src/test/java/io/appium/java_client/ios/IOSScreenRecordTest.java
@@ -1,14 +1,14 @@
 package io.appium.java_client.ios;
 
+import org.junit.jupiter.api.Test;
+
+import java.time.Duration;
+
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.emptyString;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
 
-import org.junit.jupiter.api.Test;
-
-import java.time.Duration;
-
 public class IOSScreenRecordTest extends AppIOSTest {
 
     @Test
diff --git a/src/test/java/io/appium/java_client/ios/IOSSearchingTest.java b/src/test/java/io/appium/java_client/ios/IOSSearchingTest.java
index 30213f480..5af445b0b 100644
--- a/src/test/java/io/appium/java_client/ios/IOSSearchingTest.java
+++ b/src/test/java/io/appium/java_client/ios/IOSSearchingTest.java
@@ -16,11 +16,10 @@
 
 package io.appium.java_client.ios;
 
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-
+import io.appium.java_client.AppiumBy;
 import org.junit.jupiter.api.Test;
 
-import io.appium.java_client.AppiumBy;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
 public class IOSSearchingTest extends AppIOSTest {
 
diff --git a/src/test/java/io/appium/java_client/ios/IOSSyslogListenerTest.java b/src/test/java/io/appium/java_client/ios/IOSSyslogListenerTest.java
index d5e2b377f..34429e5df 100644
--- a/src/test/java/io/appium/java_client/ios/IOSSyslogListenerTest.java
+++ b/src/test/java/io/appium/java_client/ios/IOSSyslogListenerTest.java
@@ -1,7 +1,5 @@
 package io.appium.java_client.ios;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 import org.apache.commons.lang3.time.DurationFormatUtils;
 import org.junit.jupiter.api.Test;
 
@@ -9,6 +7,8 @@
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 public class IOSSyslogListenerTest extends AppIOSTest {
 
     @Test
diff --git a/src/test/java/io/appium/java_client/ios/IOSTouchTest.java b/src/test/java/io/appium/java_client/ios/IOSTouchTest.java
index 46a4d0474..38e66359f 100644
--- a/src/test/java/io/appium/java_client/ios/IOSTouchTest.java
+++ b/src/test/java/io/appium/java_client/ios/IOSTouchTest.java
@@ -1,14 +1,5 @@
 package io.appium.java_client.ios;
 
-import static io.appium.java_client.ios.touch.IOSPressOptions.iosPressOptions;
-import static io.appium.java_client.touch.TapOptions.tapOptions;
-import static io.appium.java_client.touch.WaitOptions.waitOptions;
-import static io.appium.java_client.touch.offset.ElementOption.element;
-import static java.time.Duration.ofMillis;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.openqa.selenium.support.ui.ExpectedConditions.alertIsPresent;
-
 import io.appium.java_client.AppiumBy;
 import io.appium.java_client.MultiTouchAction;
 import org.junit.jupiter.api.MethodOrderer;
@@ -20,6 +11,15 @@
 
 import java.time.Duration;
 
+import static io.appium.java_client.ios.touch.IOSPressOptions.iosPressOptions;
+import static io.appium.java_client.touch.TapOptions.tapOptions;
+import static io.appium.java_client.touch.WaitOptions.waitOptions;
+import static io.appium.java_client.touch.offset.ElementOption.element;
+import static java.time.Duration.ofMillis;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.openqa.selenium.support.ui.ExpectedConditions.alertIsPresent;
+
 @TestMethodOrder(MethodOrderer.MethodName.class)
 public class IOSTouchTest extends AppIOSTest {
 
diff --git a/src/test/java/io/appium/java_client/ios/IOSWebViewTest.java b/src/test/java/io/appium/java_client/ios/IOSWebViewTest.java
index d03f1acdc..60943342e 100644
--- a/src/test/java/io/appium/java_client/ios/IOSWebViewTest.java
+++ b/src/test/java/io/appium/java_client/ios/IOSWebViewTest.java
@@ -1,15 +1,15 @@
 package io.appium.java_client.ios;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import java.time.Duration;
-
 import io.appium.java_client.AppiumBy;
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.support.ui.ExpectedConditions;
 import org.openqa.selenium.support.ui.WebDriverWait;
 
+import java.time.Duration;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 public class IOSWebViewTest extends BaseIOSWebViewTest {
     private static final Duration LOOKUP_TIMEOUT = Duration.ofSeconds(30);
 
diff --git a/src/test/java/io/appium/java_client/ios/ImagesComparisonTest.java b/src/test/java/io/appium/java_client/ios/ImagesComparisonTest.java
index d724b4ecb..8534f8f35 100644
--- a/src/test/java/io/appium/java_client/ios/ImagesComparisonTest.java
+++ b/src/test/java/io/appium/java_client/ios/ImagesComparisonTest.java
@@ -16,14 +16,6 @@
 
 package io.appium.java_client.ios;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.greaterThan;
-import static org.hamcrest.core.Is.is;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
-import java.util.Base64;
-
 import io.appium.java_client.imagecomparison.FeatureDetector;
 import io.appium.java_client.imagecomparison.FeaturesMatchingOptions;
 import io.appium.java_client.imagecomparison.FeaturesMatchingResult;
@@ -35,6 +27,14 @@
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.OutputType;
 
+import java.util.Base64;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.core.Is.is;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 public class ImagesComparisonTest extends AppIOSTest {
 
     @Test
diff --git a/src/test/java/io/appium/java_client/ios/RotationTest.java b/src/test/java/io/appium/java_client/ios/RotationTest.java
index 21d177fff..1d741845f 100644
--- a/src/test/java/io/appium/java_client/ios/RotationTest.java
+++ b/src/test/java/io/appium/java_client/ios/RotationTest.java
@@ -16,12 +16,12 @@
 
 package io.appium.java_client.ios;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.DeviceRotation;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class RotationTest extends AppIOSTest {
 
     @AfterEach public void afterMethod() {
diff --git a/src/test/java/io/appium/java_client/ios/SettingTest.java b/src/test/java/io/appium/java_client/ios/SettingTest.java
index 9fc2bfa4b..647b93e2d 100644
--- a/src/test/java/io/appium/java_client/ios/SettingTest.java
+++ b/src/test/java/io/appium/java_client/ios/SettingTest.java
@@ -20,12 +20,12 @@
 import io.appium.java_client.Setting;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.Map;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class SettingTest extends AppIOSTest {
 
     @Test public void testSetShouldUseCompactResponses() {
diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/AndroidPageObjectTest.java b/src/test/java/io/appium/java_client/pagefactory_tests/AndroidPageObjectTest.java
index 433aa2a1a..a135c30e3 100644
--- a/src/test/java/io/appium/java_client/pagefactory_tests/AndroidPageObjectTest.java
+++ b/src/test/java/io/appium/java_client/pagefactory_tests/AndroidPageObjectTest.java
@@ -16,16 +16,7 @@
 
 package io.appium.java_client.pagefactory_tests;
 
-import static io.appium.java_client.pagefactory.LocatorGroupStrategy.ALL_POSSIBLE;
-import static java.time.Duration.ofSeconds;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 import io.appium.java_client.android.BaseAndroidTest;
-
 import io.appium.java_client.pagefactory.AndroidBy;
 import io.appium.java_client.pagefactory.AndroidFindAll;
 import io.appium.java_client.pagefactory.AndroidFindBy;
@@ -45,6 +36,14 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static io.appium.java_client.pagefactory.LocatorGroupStrategy.ALL_POSSIBLE;
+import static java.time.Duration.ofSeconds;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 public class AndroidPageObjectTest extends BaseAndroidTest {
 
     private boolean populated = false;
diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/DesktopBrowserCompatibilityTest.java b/src/test/java/io/appium/java_client/pagefactory_tests/DesktopBrowserCompatibilityTest.java
index c2cb1b6f4..aeefba86e 100644
--- a/src/test/java/io/appium/java_client/pagefactory_tests/DesktopBrowserCompatibilityTest.java
+++ b/src/test/java/io/appium/java_client/pagefactory_tests/DesktopBrowserCompatibilityTest.java
@@ -16,13 +16,6 @@
 
 package io.appium.java_client.pagefactory_tests;
 
-import static io.appium.java_client.TestResources.helloAppiumHtml;
-import static io.appium.java_client.pagefactory.LocatorGroupStrategy.ALL_POSSIBLE;
-import static io.github.bonigarcia.wdm.WebDriverManager.chromedriver;
-import static java.time.Duration.ofSeconds;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-
 import io.appium.java_client.android.AndroidDriver;
 import io.appium.java_client.pagefactory.AndroidFindBy;
 import io.appium.java_client.pagefactory.AppiumFieldDecorator;
@@ -39,6 +32,13 @@
 
 import java.util.List;
 
+import static io.appium.java_client.TestResources.helloAppiumHtml;
+import static io.appium.java_client.pagefactory.LocatorGroupStrategy.ALL_POSSIBLE;
+import static io.github.bonigarcia.wdm.WebDriverManager.chromedriver;
+import static java.time.Duration.ofSeconds;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
 public class DesktopBrowserCompatibilityTest {
 
     @HowToUseLocators(iOSXCUITAutomation = ALL_POSSIBLE)
diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/MobileBrowserCompatibilityTest.java b/src/test/java/io/appium/java_client/pagefactory_tests/MobileBrowserCompatibilityTest.java
index dad9d7a18..824261c52 100644
--- a/src/test/java/io/appium/java_client/pagefactory_tests/MobileBrowserCompatibilityTest.java
+++ b/src/test/java/io/appium/java_client/pagefactory_tests/MobileBrowserCompatibilityTest.java
@@ -16,8 +16,6 @@
 
 package io.appium.java_client.pagefactory_tests;
 
-import static java.time.Duration.ofSeconds;
-
 import io.appium.java_client.android.AndroidDriver;
 import io.appium.java_client.android.options.UiAutomator2Options;
 import io.appium.java_client.pagefactory.AndroidFindBy;
@@ -37,6 +35,8 @@
 
 import java.util.List;
 
+import static java.time.Duration.ofSeconds;
+
 public class MobileBrowserCompatibilityTest {
 
     private WebDriver driver;
diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/TimeoutTest.java b/src/test/java/io/appium/java_client/pagefactory_tests/TimeoutTest.java
index cfba2ba36..2fbe87f41 100644
--- a/src/test/java/io/appium/java_client/pagefactory_tests/TimeoutTest.java
+++ b/src/test/java/io/appium/java_client/pagefactory_tests/TimeoutTest.java
@@ -16,18 +16,6 @@
 
 package io.appium.java_client.pagefactory_tests;
 
-import static io.appium.java_client.pagefactory.AppiumFieldDecorator.DEFAULT_WAITING_TIMEOUT;
-import static io.github.bonigarcia.wdm.WebDriverManager.chromedriver;
-import static java.lang.Math.abs;
-import static java.lang.String.format;
-import static java.lang.System.currentTimeMillis;
-import static java.time.Duration.ofSeconds;
-import static java.time.temporal.ChronoUnit.SECONDS;
-import static org.apache.commons.lang3.time.DurationFormatUtils.formatDuration;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.lessThanOrEqualTo;
-import static org.openqa.selenium.support.PageFactory.initElements;
-
 import io.appium.java_client.pagefactory.AppiumFieldDecorator;
 import io.appium.java_client.pagefactory.WithTimeout;
 import org.junit.jupiter.api.AfterEach;
@@ -43,6 +31,18 @@
 import java.time.Duration;
 import java.util.List;
 
+import static io.appium.java_client.pagefactory.AppiumFieldDecorator.DEFAULT_WAITING_TIMEOUT;
+import static io.github.bonigarcia.wdm.WebDriverManager.chromedriver;
+import static java.lang.Math.abs;
+import static java.lang.String.format;
+import static java.lang.System.currentTimeMillis;
+import static java.time.Duration.ofSeconds;
+import static java.time.temporal.ChronoUnit.SECONDS;
+import static org.apache.commons.lang3.time.DurationFormatUtils.formatDuration;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.lessThanOrEqualTo;
+import static org.openqa.selenium.support.PageFactory.initElements;
+
 public class TimeoutTest {
 
     private static final long ACCEPTABLE_TIME_DIFF_MS = 1500;
diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/XCUITModeTest.java b/src/test/java/io/appium/java_client/pagefactory_tests/XCUITModeTest.java
index 418f35e71..9660da6a4 100644
--- a/src/test/java/io/appium/java_client/pagefactory_tests/XCUITModeTest.java
+++ b/src/test/java/io/appium/java_client/pagefactory_tests/XCUITModeTest.java
@@ -16,17 +16,6 @@
 
 package io.appium.java_client.pagefactory_tests;
 
-import static io.appium.java_client.pagefactory.LocatorGroupStrategy.ALL_POSSIBLE;
-import static io.appium.java_client.pagefactory.LocatorGroupStrategy.CHAIN;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.greaterThan;
-import static org.hamcrest.Matchers.is;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 import io.appium.java_client.ios.AppIOSTest;
 import io.appium.java_client.pagefactory.AppiumFieldDecorator;
 import io.appium.java_client.pagefactory.HowToUseLocators;
@@ -40,6 +29,17 @@
 
 import java.util.List;
 
+import static io.appium.java_client.pagefactory.LocatorGroupStrategy.ALL_POSSIBLE;
+import static io.appium.java_client.pagefactory.LocatorGroupStrategy.CHAIN;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.Matchers.is;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 @TestMethodOrder(MethodOrderer.MethodName.class)
 public class XCUITModeTest extends AppIOSTest {
 
diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/AbstractStubWebDriver.java b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/AbstractStubWebDriver.java
index f71d1d8c4..6f7dbb1c9 100644
--- a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/AbstractStubWebDriver.java
+++ b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/AbstractStubWebDriver.java
@@ -1,13 +1,5 @@
 package io.appium.java_client.pagefactory_tests.widget.tests;
 
-import static com.google.common.collect.ImmutableList.of;
-import static io.appium.java_client.remote.AutomationName.ANDROID_UIAUTOMATOR2;
-import static io.appium.java_client.remote.AutomationName.IOS_XCUI_TEST;
-import static io.appium.java_client.remote.MobilePlatform.ANDROID;
-import static io.appium.java_client.remote.MobilePlatform.IOS;
-import static io.appium.java_client.remote.MobilePlatform.WINDOWS;
-import static org.apache.commons.lang3.StringUtils.EMPTY;
-
 import io.appium.java_client.HasBrowserCheck;
 import org.openqa.selenium.By;
 import org.openqa.selenium.Capabilities;
@@ -25,6 +17,14 @@
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
+import static com.google.common.collect.ImmutableList.of;
+import static io.appium.java_client.remote.AutomationName.ANDROID_UIAUTOMATOR2;
+import static io.appium.java_client.remote.AutomationName.IOS_XCUI_TEST;
+import static io.appium.java_client.remote.MobilePlatform.ANDROID;
+import static io.appium.java_client.remote.MobilePlatform.IOS;
+import static io.appium.java_client.remote.MobilePlatform.WINDOWS;
+import static org.apache.commons.lang3.StringUtils.EMPTY;
+
 public abstract class AbstractStubWebDriver implements
         WebDriver,
         HasBrowserCheck,
diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/DefaultStubWidget.java b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/DefaultStubWidget.java
index e81022a57..0e6bc08b7 100644
--- a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/DefaultStubWidget.java
+++ b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/DefaultStubWidget.java
@@ -1,7 +1,6 @@
 package io.appium.java_client.pagefactory_tests.widget.tests;
 
 import com.google.common.collect.ImmutableList;
-
 import io.appium.java_client.pagefactory.Widget;
 import org.openqa.selenium.WebElement;
 
diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/StubWebElement.java b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/StubWebElement.java
index cffb170fd..43f0864ac 100644
--- a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/StubWebElement.java
+++ b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/StubWebElement.java
@@ -1,8 +1,5 @@
 package io.appium.java_client.pagefactory_tests.widget.tests;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.collect.ImmutableList.of;
-
 import org.openqa.selenium.By;
 import org.openqa.selenium.Dimension;
 import org.openqa.selenium.OutputType;
@@ -15,6 +12,9 @@
 
 import java.util.List;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.collect.ImmutableList.of;
+
 public class StubWebElement implements WebElement, WrapsDriver {
     private final WebDriver driver;
     private final By by;
diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/WidgetTest.java b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/WidgetTest.java
index 0420d44f6..6e1f4ab2b 100644
--- a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/WidgetTest.java
+++ b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/WidgetTest.java
@@ -1,11 +1,5 @@
 package io.appium.java_client.pagefactory_tests.widget.tests;
 
-import static java.util.stream.Collectors.toList;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.contains;
-import static org.hamcrest.Matchers.containsString;
-import static org.openqa.selenium.support.PageFactory.initElements;
-
 import io.appium.java_client.pagefactory.AppiumFieldDecorator;
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.By;
@@ -13,6 +7,12 @@
 
 import java.util.List;
 
+import static java.util.stream.Collectors.toList;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.containsString;
+import static org.openqa.selenium.support.PageFactory.initElements;
+
 public abstract class WidgetTest {
 
     protected final AbstractApp app;
diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/android/AndroidWidgetTest.java b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/android/AndroidWidgetTest.java
index a3eee515a..2e0f1e0ae 100644
--- a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/android/AndroidWidgetTest.java
+++ b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/android/AndroidWidgetTest.java
@@ -1,16 +1,16 @@
 package io.appium.java_client.pagefactory_tests.widget.tests.android;
 
+import io.appium.java_client.pagefactory_tests.widget.tests.AbstractStubWebDriver;
+import io.appium.java_client.pagefactory_tests.widget.tests.ExtendedApp;
+import io.appium.java_client.pagefactory_tests.widget.tests.WidgetTest;
+import org.junit.jupiter.api.Test;
+
 import static io.appium.java_client.AppiumBy.androidUIAutomator;
 import static io.appium.java_client.pagefactory_tests.widget.tests.android.AndroidApp.ANDROID_DEFAULT_WIDGET_LOCATOR;
 import static io.appium.java_client.pagefactory_tests.widget.tests.android.AndroidApp.ANDROID_EXTERNALLY_DEFINED_WIDGET_LOCATOR;
 import static io.appium.java_client.pagefactory_tests.widget.tests.android.AnnotatedAndroidWidget.ANDROID_ROOT_WIDGET_LOCATOR;
 import static io.appium.java_client.pagefactory_tests.widget.tests.android.DefaultAndroidWidget.ANDROID_SUB_WIDGET_LOCATOR;
 
-import io.appium.java_client.pagefactory_tests.widget.tests.AbstractStubWebDriver;
-import io.appium.java_client.pagefactory_tests.widget.tests.ExtendedApp;
-import io.appium.java_client.pagefactory_tests.widget.tests.WidgetTest;
-import org.junit.jupiter.api.Test;
-
 public class AndroidWidgetTest extends WidgetTest {
 
     public AndroidWidgetTest() {
diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/combined/CombinedAppTest.java b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/combined/CombinedAppTest.java
index 80e6eb1b3..100f0322c 100644
--- a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/combined/CombinedAppTest.java
+++ b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/combined/CombinedAppTest.java
@@ -1,11 +1,5 @@
 package io.appium.java_client.pagefactory_tests.widget.tests.combined;
 
-import static java.util.stream.Collectors.toList;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.contains;
-import static org.hamcrest.Matchers.equalTo;
-import static org.openqa.selenium.support.PageFactory.initElements;
-
 import io.appium.java_client.pagefactory.AppiumFieldDecorator;
 import io.appium.java_client.pagefactory.OverrideWidget;
 import io.appium.java_client.pagefactory_tests.widget.tests.AbstractApp;
@@ -13,13 +7,20 @@
 import io.appium.java_client.pagefactory_tests.widget.tests.DefaultStubWidget;
 import io.appium.java_client.pagefactory_tests.widget.tests.android.DefaultAndroidWidget;
 import io.appium.java_client.pagefactory_tests.widget.tests.windows.DefaultWindowsWidget;
-import java.util.List;
-import java.util.stream.Stream;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.openqa.selenium.WebDriver;
 
+import java.util.List;
+import java.util.stream.Stream;
+
+import static java.util.stream.Collectors.toList;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.equalTo;
+import static org.openqa.selenium.support.PageFactory.initElements;
+
 @SuppressWarnings({"unused", "unchecked"})
 public class CombinedAppTest {
 
diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/combined/CombinedWidgetTest.java b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/combined/CombinedWidgetTest.java
index 342e37335..d54e3618c 100644
--- a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/combined/CombinedWidgetTest.java
+++ b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/combined/CombinedWidgetTest.java
@@ -1,11 +1,5 @@
 package io.appium.java_client.pagefactory_tests.widget.tests.combined;
 
-import static java.util.stream.Collectors.toList;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.contains;
-import static org.hamcrest.Matchers.equalTo;
-import static org.openqa.selenium.support.PageFactory.initElements;
-
 import io.appium.java_client.pagefactory.AppiumFieldDecorator;
 import io.appium.java_client.pagefactory.OverrideWidget;
 import io.appium.java_client.pagefactory_tests.widget.tests.AbstractApp;
@@ -23,6 +17,12 @@
 import java.util.List;
 import java.util.stream.Stream;
 
+import static java.util.stream.Collectors.toList;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.equalTo;
+import static org.openqa.selenium.support.PageFactory.initElements;
+
 
 @SuppressWarnings({"unchecked", "unused"})
 public class CombinedWidgetTest {
diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/ios/XCUITWidgetTest.java b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/ios/XCUITWidgetTest.java
index 6a9bb0d53..edaa699f7 100644
--- a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/ios/XCUITWidgetTest.java
+++ b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/ios/XCUITWidgetTest.java
@@ -1,16 +1,16 @@
 package io.appium.java_client.pagefactory_tests.widget.tests.ios;
 
+import io.appium.java_client.pagefactory_tests.widget.tests.AbstractStubWebDriver;
+import io.appium.java_client.pagefactory_tests.widget.tests.ExtendedApp;
+import io.appium.java_client.pagefactory_tests.widget.tests.WidgetTest;
+import org.junit.jupiter.api.Test;
+
 import static io.appium.java_client.AppiumBy.iOSNsPredicateString;
 import static io.appium.java_client.pagefactory_tests.widget.tests.combined.DefaultIosXCUITWidget.XCUIT_SUB_WIDGET_LOCATOR;
 import static io.appium.java_client.pagefactory_tests.widget.tests.ios.AnnotatedIosWidget.XCUIT_ROOT_WIDGET_LOCATOR;
 import static io.appium.java_client.pagefactory_tests.widget.tests.ios.IosApp.IOS_XCUIT_WIDGET_LOCATOR;
 import static io.appium.java_client.pagefactory_tests.widget.tests.ios.IosApp.XCUIT_EXTERNALLY_DEFINED_WIDGET_LOCATOR;
 
-import io.appium.java_client.pagefactory_tests.widget.tests.AbstractStubWebDriver;
-import io.appium.java_client.pagefactory_tests.widget.tests.ExtendedApp;
-import io.appium.java_client.pagefactory_tests.widget.tests.WidgetTest;
-import org.junit.jupiter.api.Test;
-
 public class XCUITWidgetTest extends WidgetTest {
 
     public XCUITWidgetTest() {
diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/windows/WindowsWidgetTest.java b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/windows/WindowsWidgetTest.java
index d5990b7e5..023b24819 100644
--- a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/windows/WindowsWidgetTest.java
+++ b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/windows/WindowsWidgetTest.java
@@ -1,16 +1,16 @@
 package io.appium.java_client.pagefactory_tests.widget.tests.windows;
 
+import io.appium.java_client.pagefactory_tests.widget.tests.AbstractStubWebDriver;
+import io.appium.java_client.pagefactory_tests.widget.tests.ExtendedApp;
+import io.appium.java_client.pagefactory_tests.widget.tests.WidgetTest;
+import org.junit.jupiter.api.Test;
+
 import static io.appium.java_client.MobileBy.windowsAutomation;
 import static io.appium.java_client.pagefactory_tests.widget.tests.windows.AnnotatedWindowsWidget.WINDOWS_ROOT_WIDGET_LOCATOR;
 import static io.appium.java_client.pagefactory_tests.widget.tests.windows.DefaultWindowsWidget.WINDOWS_SUB_WIDGET_LOCATOR;
 import static io.appium.java_client.pagefactory_tests.widget.tests.windows.WindowsApp.WINDOWS_DEFAULT_WIDGET_LOCATOR;
 import static io.appium.java_client.pagefactory_tests.widget.tests.windows.WindowsApp.WINDOWS_EXTERNALLY_DEFINED_WIDGET_LOCATOR;
 
-import io.appium.java_client.pagefactory_tests.widget.tests.AbstractStubWebDriver;
-import io.appium.java_client.pagefactory_tests.widget.tests.ExtendedApp;
-import io.appium.java_client.pagefactory_tests.widget.tests.WidgetTest;
-import org.junit.jupiter.api.Test;
-
 public class WindowsWidgetTest extends WidgetTest {
 
     public WindowsWidgetTest() {
diff --git a/src/test/java/io/appium/java_client/service/local/ServerBuilderTest.java b/src/test/java/io/appium/java_client/service/local/ServerBuilderTest.java
index ccdd117d2..923fa57b8 100644
--- a/src/test/java/io/appium/java_client/service/local/ServerBuilderTest.java
+++ b/src/test/java/io/appium/java_client/service/local/ServerBuilderTest.java
@@ -1,5 +1,20 @@
 package io.appium.java_client.service.local;
 
+import com.google.common.collect.ImmutableMap;
+import io.appium.java_client.android.options.UiAutomator2Options;
+import io.github.bonigarcia.wdm.WebDriverManager;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+import java.io.OutputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
+
 import static io.appium.java_client.TestResources.apiDemosApk;
 import static io.appium.java_client.TestUtils.getLocalIp4Address;
 import static io.appium.java_client.service.local.AppiumDriverLocalService.buildDefaultService;
@@ -24,20 +39,6 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import com.google.common.collect.ImmutableMap;
-import io.appium.java_client.android.options.UiAutomator2Options;
-import io.github.bonigarcia.wdm.WebDriverManager;
-import java.io.File;
-import java.io.OutputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.time.Duration;
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-
 @SuppressWarnings("ResultOfMethodCallIgnored")
 class ServerBuilderTest {
 
diff --git a/src/test/java/io/appium/java_client/service/local/StartingAppLocallyAndroidTest.java b/src/test/java/io/appium/java_client/service/local/StartingAppLocallyAndroidTest.java
index 55906d13f..36518f4ed 100644
--- a/src/test/java/io/appium/java_client/service/local/StartingAppLocallyAndroidTest.java
+++ b/src/test/java/io/appium/java_client/service/local/StartingAppLocallyAndroidTest.java
@@ -16,12 +16,6 @@
 
 package io.appium.java_client.service.local;
 
-import static io.appium.java_client.TestResources.apiDemosApk;
-import static io.github.bonigarcia.wdm.WebDriverManager.chromedriver;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 import io.appium.java_client.android.AndroidDriver;
 import io.appium.java_client.android.options.UiAutomator2Options;
 import io.appium.java_client.remote.AutomationName;
@@ -29,10 +23,17 @@
 import io.appium.java_client.remote.MobilePlatform;
 import io.appium.java_client.service.local.flags.GeneralServerFlag;
 import io.github.bonigarcia.wdm.WebDriverManager;
-import java.time.Duration;
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.Capabilities;
 
+import java.time.Duration;
+
+import static io.appium.java_client.TestResources.apiDemosApk;
+import static io.github.bonigarcia.wdm.WebDriverManager.chromedriver;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 class StartingAppLocallyAndroidTest {
 
     @Test
diff --git a/src/test/java/io/appium/java_client/service/local/StartingAppLocallyIosTest.java b/src/test/java/io/appium/java_client/service/local/StartingAppLocallyIosTest.java
index 07bf8008a..6baf77701 100644
--- a/src/test/java/io/appium/java_client/service/local/StartingAppLocallyIosTest.java
+++ b/src/test/java/io/appium/java_client/service/local/StartingAppLocallyIosTest.java
@@ -16,12 +16,6 @@
 
 package io.appium.java_client.service.local;
 
-import static io.appium.java_client.TestResources.uiCatalogAppZip;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 import io.appium.java_client.ios.BaseIOSTest;
 import io.appium.java_client.ios.IOSDriver;
 import io.appium.java_client.ios.options.XCUITestOptions;
@@ -33,6 +27,12 @@
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.Platform;
 
+import static io.appium.java_client.TestResources.uiCatalogAppZip;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 class StartingAppLocallyIosTest {
     @Test
     void startingIOSAppWithCapabilitiesOnlyTest() {
diff --git a/src/test/java/io/appium/java_client/service/local/ThreadSafetyTest.java b/src/test/java/io/appium/java_client/service/local/ThreadSafetyTest.java
index f4fb55b42..8087da057 100644
--- a/src/test/java/io/appium/java_client/service/local/ThreadSafetyTest.java
+++ b/src/test/java/io/appium/java_client/service/local/ThreadSafetyTest.java
@@ -1,11 +1,11 @@
 package io.appium.java_client.service.local;
 
+import org.junit.jupiter.api.Test;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.junit.jupiter.api.Test;
-
 class ThreadSafetyTest {
 
     private final AppiumDriverLocalService service = AppiumDriverLocalService.buildDefaultService();
diff --git a/src/test/java/io/appium/java_client/touch/FailsWithMatcher.java b/src/test/java/io/appium/java_client/touch/FailsWithMatcher.java
index f4ac4bec8..2d79fcfec 100644
--- a/src/test/java/io/appium/java_client/touch/FailsWithMatcher.java
+++ b/src/test/java/io/appium/java_client/touch/FailsWithMatcher.java
@@ -1,12 +1,12 @@
 package io.appium.java_client.touch;
 
-import static org.hamcrest.core.AllOf.allOf;
-import static org.hamcrest.core.IsInstanceOf.instanceOf;
-
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeMatcher;
 
+import static org.hamcrest.core.AllOf.allOf;
+import static org.hamcrest.core.IsInstanceOf.instanceOf;
+
 public final class FailsWithMatcher<E extends Throwable> extends TypeSafeMatcher<Runnable> {
 
     private final Matcher<? super E> matcher;
diff --git a/src/test/java/io/appium/java_client/touch/TouchOptionsTests.java b/src/test/java/io/appium/java_client/touch/TouchOptionsTests.java
index b08249962..a68bc3fa6 100644
--- a/src/test/java/io/appium/java_client/touch/TouchOptionsTests.java
+++ b/src/test/java/io/appium/java_client/touch/TouchOptionsTests.java
@@ -1,5 +1,16 @@
 package io.appium.java_client.touch;
 
+import io.appium.java_client.touch.offset.ElementOption;
+import io.appium.java_client.touch.offset.PointOption;
+import org.junit.jupiter.api.Test;
+import org.openqa.selenium.Point;
+import org.openqa.selenium.remote.RemoteWebElement;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import static io.appium.java_client.touch.FailsWithMatcher.failsWith;
 import static io.appium.java_client.touch.LongPressOptions.longPressOptions;
 import static io.appium.java_client.touch.TapOptions.tapOptions;
@@ -14,17 +25,6 @@
 import static org.hamcrest.Matchers.is;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-import io.appium.java_client.touch.offset.ElementOption;
-import io.appium.java_client.touch.offset.PointOption;
-import org.junit.jupiter.api.Test;
-import org.openqa.selenium.Point;
-import org.openqa.selenium.remote.RemoteWebElement;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 public class TouchOptionsTests {
     private static final RemoteWebElement DUMMY_ELEMENT = new DummyElement();