diff --git a/core/src/main/java/com/novoda/accessibility/Action.java b/core/src/main/java/com/novoda/accessibility/Action.java
index 5dbd780..e84075b 100644
--- a/core/src/main/java/com/novoda/accessibility/Action.java
+++ b/core/src/main/java/com/novoda/accessibility/Action.java
@@ -1,8 +1,9 @@
 package com.novoda.accessibility;
 
+import android.view.View;
+
 import androidx.annotation.IdRes;
 import androidx.annotation.StringRes;
-import android.view.View;
 
 public class Action {
 
diff --git a/core/src/main/java/com/novoda/accessibility/ActionMenuItem.java b/core/src/main/java/com/novoda/accessibility/ActionMenuItem.java
index 4ed809d..92b4dc0 100644
--- a/core/src/main/java/com/novoda/accessibility/ActionMenuItem.java
+++ b/core/src/main/java/com/novoda/accessibility/ActionMenuItem.java
@@ -3,10 +3,15 @@
 import android.content.Intent;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
+import android.util.Log;
+import android.view.ActionProvider;
+import android.view.ContextMenu;
+import android.view.MenuItem;
+import android.view.SubMenu;
+import android.view.View;
+
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
-import android.util.Log;
-import android.view.*;
 
 class ActionMenuItem implements MenuItem {
 
diff --git a/core/src/main/java/com/novoda/accessibility/ActionsAccessibilityDelegate.java b/core/src/main/java/com/novoda/accessibility/ActionsAccessibilityDelegate.java
index 4f49287..555ed9d 100644
--- a/core/src/main/java/com/novoda/accessibility/ActionsAccessibilityDelegate.java
+++ b/core/src/main/java/com/novoda/accessibility/ActionsAccessibilityDelegate.java
@@ -2,10 +2,11 @@
 
 import android.content.res.Resources;
 import android.os.Bundle;
+import android.view.View;
+
 import androidx.annotation.StringRes;
 import androidx.core.view.AccessibilityDelegateCompat;
 import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
-import android.view.View;
 
 public class ActionsAccessibilityDelegate extends AccessibilityDelegateCompat {
 
diff --git a/core/src/main/java/com/novoda/accessibility/ActionsAlertDialogCreator.java b/core/src/main/java/com/novoda/accessibility/ActionsAlertDialogCreator.java
index 85fee57..ea24e2f 100644
--- a/core/src/main/java/com/novoda/accessibility/ActionsAlertDialogCreator.java
+++ b/core/src/main/java/com/novoda/accessibility/ActionsAlertDialogCreator.java
@@ -1,7 +1,7 @@
 package com.novoda.accessibility;
 
 import android.content.Context;
-import android.content.DialogInterface;
+
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.AlertDialog;
 
diff --git a/core/src/main/java/com/novoda/accessibility/ActionsMenu.java b/core/src/main/java/com/novoda/accessibility/ActionsMenu.java
index 5766d16..465963d 100644
--- a/core/src/main/java/com/novoda/accessibility/ActionsMenu.java
+++ b/core/src/main/java/com/novoda/accessibility/ActionsMenu.java
@@ -3,13 +3,14 @@
 import android.content.ComponentName;
 import android.content.Intent;
 import android.content.res.Resources;
-import androidx.annotation.Nullable;
-import androidx.annotation.StringRes;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.SubMenu;
 
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/core/src/main/java/com/novoda/accessibility/ActionsMenuAccessibilityDelegate.java b/core/src/main/java/com/novoda/accessibility/ActionsMenuAccessibilityDelegate.java
index 2a480c6..462cc01 100644
--- a/core/src/main/java/com/novoda/accessibility/ActionsMenuAccessibilityDelegate.java
+++ b/core/src/main/java/com/novoda/accessibility/ActionsMenuAccessibilityDelegate.java
@@ -2,12 +2,13 @@
 
 import android.content.res.Resources;
 import android.os.Bundle;
-import androidx.core.view.AccessibilityDelegateCompat;
-import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 
+import androidx.core.view.AccessibilityDelegateCompat;
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
+
 public class ActionsMenuAccessibilityDelegate extends AccessibilityDelegateCompat {
 
     private final Menu menu;
diff --git a/core/src/main/java/com/novoda/accessibility/ActionsMenuAlertDialog.java b/core/src/main/java/com/novoda/accessibility/ActionsMenuAlertDialog.java
index bb8113e..f1efb14 100644
--- a/core/src/main/java/com/novoda/accessibility/ActionsMenuAlertDialog.java
+++ b/core/src/main/java/com/novoda/accessibility/ActionsMenuAlertDialog.java
@@ -1,10 +1,11 @@
 package com.novoda.accessibility;
 
 import android.content.Context;
-import androidx.appcompat.app.AlertDialog;
 import android.view.Menu;
 import android.view.MenuItem;
 
+import androidx.appcompat.app.AlertDialog;
+
 public class ActionsMenuAlertDialog {
 
     public static AlertDialog.Builder create(Context context, Menu menu, MenuItem.OnMenuItemClickListener menuItemClickListener) {
diff --git a/core/src/main/java/com/novoda/accessibility/ActionsMenuInflater.java b/core/src/main/java/com/novoda/accessibility/ActionsMenuInflater.java
index b70338e..f1d6c6b 100644
--- a/core/src/main/java/com/novoda/accessibility/ActionsMenuInflater.java
+++ b/core/src/main/java/com/novoda/accessibility/ActionsMenuInflater.java
@@ -2,11 +2,12 @@
 
 import android.content.Context;
 import android.content.res.Resources;
-import androidx.annotation.MenuRes;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
+import androidx.annotation.MenuRes;
+
 public class ActionsMenuInflater {
 
     private final MenuInflater menuInflater;
diff --git a/core/src/main/java/com/novoda/accessibility/UsageHints.java b/core/src/main/java/com/novoda/accessibility/UsageHints.java
index 61e6f9f..1db39df 100644
--- a/core/src/main/java/com/novoda/accessibility/UsageHints.java
+++ b/core/src/main/java/com/novoda/accessibility/UsageHints.java
@@ -1,9 +1,10 @@
 package com.novoda.accessibility;
 
 import android.content.res.Resources;
+import android.view.View;
+
 import androidx.annotation.StringRes;
 import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
-import android.view.View;
 
 import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_CLICK;
 import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_LONG_CLICK;
diff --git a/core/src/main/java/com/novoda/accessibility/UsageHintsAccessibilityDelegate.java b/core/src/main/java/com/novoda/accessibility/UsageHintsAccessibilityDelegate.java
index 6e502a6..2fed0fa 100644
--- a/core/src/main/java/com/novoda/accessibility/UsageHintsAccessibilityDelegate.java
+++ b/core/src/main/java/com/novoda/accessibility/UsageHintsAccessibilityDelegate.java
@@ -1,10 +1,11 @@
 package com.novoda.accessibility;
 
 import android.content.res.Resources;
+import android.view.View;
+
 import androidx.annotation.StringRes;
 import androidx.core.view.AccessibilityDelegateCompat;
 import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
-import android.view.View;
 
 public class UsageHintsAccessibilityDelegate extends AccessibilityDelegateCompat {
 
diff --git a/demo/src/main/java/com/novoda/accessibility/demo/AccessibilityServicesActivity.java b/demo/src/main/java/com/novoda/accessibility/demo/AccessibilityServicesActivity.java
index 10115bb..b2f8951 100644
--- a/demo/src/main/java/com/novoda/accessibility/demo/AccessibilityServicesActivity.java
+++ b/demo/src/main/java/com/novoda/accessibility/demo/AccessibilityServicesActivity.java
@@ -1,9 +1,10 @@
 package com.novoda.accessibility.demo;
 
 import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
 import android.widget.TextView;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.novoda.accessibility.AccessibilityServices;
 
 public class AccessibilityServicesActivity extends AppCompatActivity {
diff --git a/demo/src/main/java/com/novoda/accessibility/demo/DemosActivity.java b/demo/src/main/java/com/novoda/accessibility/demo/DemosActivity.java
index bc7b6bc..dd611c6 100644
--- a/demo/src/main/java/com/novoda/accessibility/demo/DemosActivity.java
+++ b/demo/src/main/java/com/novoda/accessibility/demo/DemosActivity.java
@@ -1,9 +1,10 @@
 package com.novoda.accessibility.demo;
 
 import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
 import android.widget.ListView;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.novoda.accessibility.demo.base.Demo;
 import com.novoda.accessibility.demo.base.DemoAdapter;
 import com.novoda.accessibility.demo.custom_actions.CustomActionsActivity;
diff --git a/demo/src/main/java/com/novoda/accessibility/demo/custom_actions/CustomActionsActivity.java b/demo/src/main/java/com/novoda/accessibility/demo/custom_actions/CustomActionsActivity.java
index baf0311..d849478 100644
--- a/demo/src/main/java/com/novoda/accessibility/demo/custom_actions/CustomActionsActivity.java
+++ b/demo/src/main/java/com/novoda/accessibility/demo/custom_actions/CustomActionsActivity.java
@@ -1,9 +1,10 @@
 package com.novoda.accessibility.demo.custom_actions;
 
 import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
 import android.widget.Toast;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.novoda.accessibility.demo.R;
 
 public class CustomActionsActivity extends AppCompatActivity {
diff --git a/demo/src/main/java/com/novoda/accessibility/demo/custom_actions/TweetView.java b/demo/src/main/java/com/novoda/accessibility/demo/custom_actions/TweetView.java
index 1a6baff..f243071 100644
--- a/demo/src/main/java/com/novoda/accessibility/demo/custom_actions/TweetView.java
+++ b/demo/src/main/java/com/novoda/accessibility/demo/custom_actions/TweetView.java
@@ -1,16 +1,22 @@
 package com.novoda.accessibility.demo.custom_actions;
 
 import android.content.Context;
-import androidx.core.view.AccessibilityDelegateCompat;
-import androidx.core.view.ViewCompat;
-import androidx.appcompat.app.AlertDialog;
 import android.util.AttributeSet;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import com.novoda.accessibility.*;
+
+import androidx.appcompat.app.AlertDialog;
+import androidx.core.view.AccessibilityDelegateCompat;
+import androidx.core.view.ViewCompat;
+
+import com.novoda.accessibility.AccessibilityServices;
+import com.novoda.accessibility.ActionsMenuAccessibilityDelegate;
+import com.novoda.accessibility.ActionsMenuAlertDialog;
+import com.novoda.accessibility.ActionsMenuInflater;
+import com.novoda.accessibility.UsageHints;
 import com.novoda.accessibility.demo.R;
 
 public class TweetView extends LinearLayout {