diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index cd69723..5743562 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.gigamole.shadowlayout"
-          xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest
+    package="com.gigamole.shadowlayout"
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
diff --git a/app/src/main/res/drawable/bg_fill.xml b/app/src/main/res/drawable/bg_fill.xml
index a3947ad..5cea379 100644
--- a/app/src/main/res/drawable/bg_fill.xml
+++ b/app/src/main/res/drawable/bg_fill.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:dither="true"
-    android:shape="rectangle">
+       android:dither="true"
+       android:shape="rectangle">
 
     <solid android:color="#EEE5E9"/>
-    <stroke android:color="#000" android:width="2dp"/>
-    <corners android:radius="10dp" />
+    <stroke
+        android:width="2dp"
+        android:color="#000"/>
+    <corners android:radius="10dp"/>
 
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_stroke.xml b/app/src/main/res/drawable/bg_stroke.xml
index 67d0c40..945e873 100644
--- a/app/src/main/res/drawable/bg_stroke.xml
+++ b/app/src/main/res/drawable/bg_stroke.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:dither="true"
-    android:shape="rectangle">
+       android:dither="true"
+       android:shape="rectangle">
 
     <solid android:color="#00000000"/>
-    <stroke android:color="#EEE5E9" android:width="2dp"/>
-    <corners android:radius="10dp" />
+    <stroke
+        android:width="2dp"
+        android:color="#EEE5E9"/>
+    <corners android:radius="10dp"/>
 
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 9ad89d6..c213054 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -80,8 +80,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:gravity="center"
                 android:layout_marginTop="10dp"
+                android:gravity="center"
                 android:text="*ShadowLayout*"
                 android:textColor="#EEE5E9"
                 android:textSize="40sp"/>
@@ -108,13 +108,13 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:gravity="center"
                 android:background="@drawable/bg_fill"
-                android:textStyle="bold"
+                android:gravity="center"
                 android:padding="10dp"
                 android:text="@string/app_name"
                 android:textColor="#D64933"
-                android:textSize="30sp"/>
+                android:textSize="30sp"
+                android:textStyle="bold"/>
 
             <ImageView
                 android:layout_width="40dp"
@@ -159,8 +159,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="horizontal"
-            android:gravity="center">
+            android:gravity="center"
+            android:orientation="horizontal">
 
             <ImageView
                 android:layout_width="100dp"
@@ -175,21 +175,21 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:gravity="center"
                 android:layout_marginLeft="30dp"
                 android:layout_marginStart="30dp"
+                android:gravity="center"
                 android:text="SL"
-                android:textStyle="bold"
                 android:textColor="#EEE5E9"
-                android:textSize="40sp"/>
+                android:textSize="40sp"
+                android:textStyle="bold"/>
 
             <ImageView
                 android:layout_width="100dp"
                 android:layout_height="100dp"
                 android:layout_gravity="center"
-                android:background="@drawable/bg_stroke"
                 android:layout_marginLeft="30dp"
                 android:layout_marginStart="30dp"
+                android:background="@drawable/bg_stroke"
                 android:padding="20dp"
                 android:src="@drawable/ic_seventh"
                 android:tint="#EEE5E9"/>
diff --git a/library/src/main/java/com/gigamole/library/ShadowLayout.java b/library/src/main/java/com/gigamole/library/ShadowLayout.java
index ee157df..567d747 100644
--- a/library/src/main/java/com/gigamole/library/ShadowLayout.java
+++ b/library/src/main/java/com/gigamole/library/ShadowLayout.java
@@ -43,13 +43,6 @@ public class ShadowLayout extends FrameLayout {
     private final static float MAX_ANGLE = 360.0f;
     private final static float MIN_RADIUS = 0.1f;
     private final static float MIN_ANGLE = 0.0f;
-
-    // Shadow bitmap and canvas
-    private Bitmap mBitmap;
-    private Canvas mCanvas = new Canvas();
-
-    // View bounds
-    private Rect mBounds = new Rect();
     // Shadow paint
     private final Paint mPaint = new Paint(Paint.ANTI_ALIAS_FLAG) {
         {
@@ -57,7 +50,11 @@ public class ShadowLayout extends FrameLayout {
             setFilterBitmap(true);
         }
     };
-
+    // Shadow bitmap and canvas
+    private Bitmap mBitmap;
+    private Canvas mCanvas = new Canvas();
+    // View bounds
+    private Rect mBounds = new Rect();
     // Check whether need to redraw shadow
     private boolean mInvalidateShadow = true;