diff --git a/app/src/main/java/com/layoutxml/applistmanager/MainActivity.java b/app/src/main/java/com/layoutxml/applistmanager/MainActivity.java
index 00df9e9..b08a765 100644
--- a/app/src/main/java/com/layoutxml/applistmanager/MainActivity.java
+++ b/app/src/main/java/com/layoutxml/applistmanager/MainActivity.java
@@ -156,11 +156,6 @@ public void onClick(View v) {
 
     }
 
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-    }
-
     @Override
     public void appListener(List<AppData> appDataList, Integer applicationFlags, Boolean applicationFlagsMatch, Integer uniqueIdentifier) {
         if (uniqueIdentifier==0) { //Could also be: if (filterFlags == null)
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 5e60c65..77bf088 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -274,7 +274,7 @@
         android:layout_marginRight="24dp"
         android:layout_marginStart="16dp"
         android:layout_marginTop="8dp"
-        android:text="Click the button to show how many activities were removed sice the last check"
+        android:text="Click the button to show how many activities were removed since the last check"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@+id/guideline"
diff --git a/app/src/main/res/layout/item_view.xml b/app/src/main/res/layout/item_view.xml
index 6e3be17..d853703 100644
--- a/app/src/main/res/layout/item_view.xml
+++ b/app/src/main/res/layout/item_view.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/itemLayout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/applistmanagerlibrary/src/main/java/com/layoutxml/applistmanagerlibrary/AppList.java b/applistmanagerlibrary/src/main/java/com/layoutxml/applistmanagerlibrary/AppList.java
index 9c5d8ab..af1dd21 100644
--- a/applistmanagerlibrary/src/main/java/com/layoutxml/applistmanagerlibrary/AppList.java
+++ b/applistmanagerlibrary/src/main/java/com/layoutxml/applistmanagerlibrary/AppList.java
@@ -35,7 +35,7 @@
  */
 public class AppList extends BroadcastReceiver{
 
-    public static IntentFilter intentFilter = new IntentFilter();
+    public static final IntentFilter intentFilter = new IntentFilter();
 
     //Tasks
     private static AppTask appTask;
diff --git a/applistmanagerlibrary/src/main/java/com/layoutxml/applistmanagerlibrary/tasks/ActivityTask.java b/applistmanagerlibrary/src/main/java/com/layoutxml/applistmanagerlibrary/tasks/ActivityTask.java
index 31527f9..32e663b 100644
--- a/applistmanagerlibrary/src/main/java/com/layoutxml/applistmanagerlibrary/tasks/ActivityTask.java
+++ b/applistmanagerlibrary/src/main/java/com/layoutxml/applistmanagerlibrary/tasks/ActivityTask.java
@@ -18,11 +18,11 @@ public class ActivityTask extends AsyncTask<Void,Void,List<AppData>> {
 
     private final WeakReference<ActivityListener> activitiesListenerWeakReference;
     private final WeakReference<Context> contextWeakReference;
-    private Intent intent;
-    private Integer uniqueIdentifier;
-    private Integer flags;
-    private Integer activitiesFlags;
-    private Boolean match;
+    private final Intent intent;
+    private final Integer uniqueIdentifier;
+    private final Integer flags;
+    private final Integer activitiesFlags;
+    private final Boolean match;
 
     public ActivityTask(WeakReference<Context> context, Intent intent, Integer activitiesFlags, Integer appFlags, Boolean appMatch, Integer uniqueIdentifier, WeakReference<ActivityListener> activitiesListenerWeakReference) {
         this.contextWeakReference = context;
diff --git a/applistmanagerlibrary/src/main/java/com/layoutxml/applistmanagerlibrary/tasks/AppTask.java b/applistmanagerlibrary/src/main/java/com/layoutxml/applistmanagerlibrary/tasks/AppTask.java
index 3650a92..095216c 100644
--- a/applistmanagerlibrary/src/main/java/com/layoutxml/applistmanagerlibrary/tasks/AppTask.java
+++ b/applistmanagerlibrary/src/main/java/com/layoutxml/applistmanagerlibrary/tasks/AppTask.java
@@ -18,9 +18,9 @@ public class AppTask extends AsyncTask<Void,Void,List<AppData>> {
 
     private final WeakReference<AppListener> allAppsListener;
     private final WeakReference<Context> contextWeakReference;
-    private Integer flags;
-    private Boolean match;
-    private Integer uniqueIdentifier;
+    private final Integer flags;
+    private final Boolean match;
+    private final Integer uniqueIdentifier;
 
     public AppTask(WeakReference<Context> context, Integer flags, Boolean match, Integer uniqueIdentifier, WeakReference<AppListener> allListener) {
         this.contextWeakReference = context;
diff --git a/applistmanagerlibrary/src/main/java/com/layoutxml/applistmanagerlibrary/tasks/NewActivityTask.java b/applistmanagerlibrary/src/main/java/com/layoutxml/applistmanagerlibrary/tasks/NewActivityTask.java
index e3a3d35..467d8db 100644
--- a/applistmanagerlibrary/src/main/java/com/layoutxml/applistmanagerlibrary/tasks/NewActivityTask.java
+++ b/applistmanagerlibrary/src/main/java/com/layoutxml/applistmanagerlibrary/tasks/NewActivityTask.java
@@ -18,12 +18,12 @@ public class NewActivityTask extends AsyncTask<Void,Void,List<AppData>> {
 
     private final WeakReference<NewActivityListener> newActivitiesListener;
     private final WeakReference<Context> contextWeakReference;
-    private List<AppData> receivedAppList;
-    private Integer flags;
-    private Boolean match;
-    private Integer uniqueIdentifier;
-    private Intent intent;
-    private Integer activitiesFlags;
+    private final List<AppData> receivedAppList;
+    private final Integer flags;
+    private final Boolean match;
+    private final Integer uniqueIdentifier;
+    private final Intent intent;
+    private final Integer activitiesFlags;
 
 
     public NewActivityTask(WeakReference<Context> context, List<AppData> receivedAppList, Intent intent, Integer activitiesFlags, Integer flags, Boolean match, Integer uniqueIdentifier, WeakReference<NewActivityListener> newActivitiesListener) {
diff --git a/applistmanagerlibrary/src/main/java/com/layoutxml/applistmanagerlibrary/tasks/NewAppTask.java b/applistmanagerlibrary/src/main/java/com/layoutxml/applistmanagerlibrary/tasks/NewAppTask.java
index b14af98..b4eed9a 100644
--- a/applistmanagerlibrary/src/main/java/com/layoutxml/applistmanagerlibrary/tasks/NewAppTask.java
+++ b/applistmanagerlibrary/src/main/java/com/layoutxml/applistmanagerlibrary/tasks/NewAppTask.java
@@ -19,10 +19,10 @@ public class NewAppTask extends AsyncTask<Void,Void,List<AppData>>{
 
     private final WeakReference<NewAppListener> allNewAppsListener;
     private final WeakReference<Context> contextWeakReference;
-    private List<AppData> receivedAppList;
-    private Integer flags;
-    private Boolean match;
-    private Integer uniqueIdentifier;
+    private final List<AppData> receivedAppList;
+    private final Integer flags;
+    private final Boolean match;
+    private final Integer uniqueIdentifier;
 
 
     public NewAppTask(WeakReference<Context> context, List<AppData> receivedAppList, Integer flags, Boolean match, Integer uniqueIdentifier, WeakReference<NewAppListener> newListener) {
diff --git a/applistmanagerlibrary/src/main/java/com/layoutxml/applistmanagerlibrary/tasks/SortTask.java b/applistmanagerlibrary/src/main/java/com/layoutxml/applistmanagerlibrary/tasks/SortTask.java
index e7b8241..a84257e 100644
--- a/applistmanagerlibrary/src/main/java/com/layoutxml/applistmanagerlibrary/tasks/SortTask.java
+++ b/applistmanagerlibrary/src/main/java/com/layoutxml/applistmanagerlibrary/tasks/SortTask.java
@@ -16,10 +16,10 @@
 public class SortTask extends AsyncTask<Void,Void,List<AppData>> {
 
     private final WeakReference<SortListener> sortListener;
-    private List<AppData> appDataList;
-    private Integer sortBy;
-    private Integer inOrder;
-    private Integer uniqueIdentifier;
+    private final List<AppData> appDataList;
+    private final Integer sortBy;
+    private final Integer inOrder;
+    private final Integer uniqueIdentifier;
 
     public SortTask(List<AppData> appDataList, Integer sortBy, Integer inOrder, Integer uniqueIdentifier, WeakReference<SortListener> sortListener){
         this.sortListener = sortListener;
diff --git a/applistmanagerlibrary/src/main/java/com/layoutxml/applistmanagerlibrary/tasks/UninstalledActivityTask.java b/applistmanagerlibrary/src/main/java/com/layoutxml/applistmanagerlibrary/tasks/UninstalledActivityTask.java
index 62f3aa9..20bf41b 100644
--- a/applistmanagerlibrary/src/main/java/com/layoutxml/applistmanagerlibrary/tasks/UninstalledActivityTask.java
+++ b/applistmanagerlibrary/src/main/java/com/layoutxml/applistmanagerlibrary/tasks/UninstalledActivityTask.java
@@ -18,12 +18,12 @@ public class UninstalledActivityTask extends AsyncTask<Void,Void,List<AppData>>
 
     private final WeakReference<UninstalledActivityListener> uninstalledActivitiesTaskWeakReference;
     private final WeakReference<Context> contextWeakReference;
-    private List<AppData> receivedAppList;
-    private Integer uniqueIdentifier;
-    private Intent intent;
-    private Integer activityFlags;
-    private Integer applicationFlags;
-    private Boolean applicationFlagsMatch;
+    private final List<AppData> receivedAppList;
+    private final Integer uniqueIdentifier;
+    private final Intent intent;
+    private final Integer activityFlags;
+    private final Integer applicationFlags;
+    private final Boolean applicationFlagsMatch;
 
 
     public UninstalledActivityTask(WeakReference<Context> context, List<AppData> receivedAppList, Intent intent, Integer activityFlags, Integer applicationFlags, Boolean applicationFlagsMatch, Integer uniqueIdentifier, WeakReference<UninstalledActivityListener> uninstalledListener) {
diff --git a/applistmanagerlibrary/src/main/java/com/layoutxml/applistmanagerlibrary/tasks/UninstalledAppTask.java b/applistmanagerlibrary/src/main/java/com/layoutxml/applistmanagerlibrary/tasks/UninstalledAppTask.java
index 8fb93e7..601fe63 100644
--- a/applistmanagerlibrary/src/main/java/com/layoutxml/applistmanagerlibrary/tasks/UninstalledAppTask.java
+++ b/applistmanagerlibrary/src/main/java/com/layoutxml/applistmanagerlibrary/tasks/UninstalledAppTask.java
@@ -19,10 +19,10 @@ public class UninstalledAppTask extends AsyncTask<Void,Void,List<AppData>>{
 
     private final WeakReference<UninstalledAppListener> allUninstalledAppsListener;
     private final WeakReference<Context> contextWeakReference;
-    private List<AppData> receivedAppList;
-    private Integer uniqueIdentifier;
-    private Integer applicationFlags;
-    private Boolean applicationFlagsMatch;
+    private final List<AppData> receivedAppList;
+    private final Integer uniqueIdentifier;
+    private final Integer applicationFlags;
+    private final Boolean applicationFlagsMatch;
 
 
     public UninstalledAppTask(WeakReference<Context> context, List<AppData> receivedAppList, Integer applicationFlags, Boolean applicationFlagsMatch, Integer uniqueIdentifier,  WeakReference<UninstalledAppListener> uninstalledListener) {