diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index efba953..8c39ecb 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ The MIT License (MIT)
   ~
   ~ Copyright (c) 2017 Raphaël Bussa
@@ -27,14 +26,14 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="rebus.header.view.sample">
 
-    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.INTERNET" />
 
     <application
+        android:name=".CustomApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:name=".CustomApplication"
         android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme.Drawer"
         tools:ignore="AllowBackup,GoogleAppIndexingWarning">
diff --git a/app/src/main/java/rebus/header/view/sample/MainActivity.java b/app/src/main/java/rebus/header/view/sample/MainActivity.java
index 2269a2e..55bd0bd 100644
--- a/app/src/main/java/rebus/header/view/sample/MainActivity.java
+++ b/app/src/main/java/rebus/header/view/sample/MainActivity.java
@@ -24,13 +24,13 @@
 
 package rebus.header.view.sample;
 
+import android.os.Bundle;
 import android.support.design.widget.NavigationView;
 import android.support.v4.content.ContextCompat;
 import android.support.v4.view.GravityCompat;
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBarDrawerToggle;
 import android.support.v7.app.AppCompatActivity;
-import android.os.Bundle;
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.View;
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 9b9f6b7..36fa597 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ The MIT License (MIT)
   ~
   ~ Copyright (c) 2017 Raphaël Bussa
@@ -42,10 +41,10 @@
             android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
 
         <LinearLayout
-            android:orientation="vertical"
-            android:layout_below="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="match_parent" >
+            android:layout_height="match_parent"
+            android:layout_below="@+id/toolbar"
+            android:orientation="vertical">
 
         </LinearLayout>
 
diff --git a/app/src/main/res/menu/drawer.xml b/app/src/main/res/menu/drawer.xml
index df86499..da81103 100644
--- a/app/src/main/res/menu/drawer.xml
+++ b/app/src/main/res/menu/drawer.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ The MIT License (MIT)
   ~
   ~ Copyright (c) 2017 Raphaël Bussa
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index ee5e14f..39f5ee7 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ The MIT License (MIT)
   ~
   ~ Copyright (c) 2017 Raphaël Bussa
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index d671ec7..b2756b1 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ The MIT License (MIT)
   ~
   ~ Copyright (c) 2017 Raphaël Bussa
diff --git a/library/src/main/res/layout/hw_account_chooser.xml b/library/src/main/res/layout/hw_account_chooser.xml
index 52203cc..5dc1866 100644
--- a/library/src/main/res/layout/hw_account_chooser.xml
+++ b/library/src/main/res/layout/hw_account_chooser.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ The MIT License (MIT)
   ~
   ~ Copyright (c) 2017 Raphaël Bussa
diff --git a/library/src/main/res/values-ldrtl/bools.xml b/library/src/main/res/values-ldrtl/bools.xml
index c99fee6..c4e25ac 100644
--- a/library/src/main/res/values-ldrtl/bools.xml
+++ b/library/src/main/res/values-ldrtl/bools.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ The MIT License (MIT)
   ~
   ~ Copyright (c) 2017 Raphaël Bussa
@@ -24,7 +23,7 @@
   -->
 
 <resources>
-    
+
     <bool name="is_right_to_left">true</bool>
-    
+
 </resources>
\ No newline at end of file
diff --git a/library/src/main/res/values/attrs.xml b/library/src/main/res/values/attrs.xml
index b68046d..efcc6d7 100644
--- a/library/src/main/res/values/attrs.xml
+++ b/library/src/main/res/values/attrs.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ The MIT License (MIT)
   ~
   ~ Copyright (c) 2017 Raphaël Bussa
diff --git a/library/src/main/res/values/bools.xml b/library/src/main/res/values/bools.xml
index 7a6b1ea..43d4493 100644
--- a/library/src/main/res/values/bools.xml
+++ b/library/src/main/res/values/bools.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ The MIT License (MIT)
   ~
   ~ Copyright (c) 2017 Raphaël Bussa
diff --git a/library/src/main/res/values/dimens.xml b/library/src/main/res/values/dimens.xml
index 53d857a..6cec5ac 100644
--- a/library/src/main/res/values/dimens.xml
+++ b/library/src/main/res/values/dimens.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ The MIT License (MIT)
   ~
   ~ Copyright (c) 2017 Raphaël Bussa
diff --git a/library/src/main/res/values/ids.xml b/library/src/main/res/values/ids.xml
index cedabb0..e7f40c6 100644
--- a/library/src/main/res/values/ids.xml
+++ b/library/src/main/res/values/ids.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ The MIT License (MIT)
   ~
   ~ Copyright (c) 2017 Raphaël Bussa
diff --git a/library/src/main/res/values/library_headerview_strings.xml b/library/src/main/res/values/library_headerview_strings.xml
index d088352..73b427c 100644
--- a/library/src/main/res/values/library_headerview_strings.xml
+++ b/library/src/main/res/values/library_headerview_strings.xml
@@ -25,16 +25,16 @@
   -->
 
 <resources>
-	<string name="define_headerview">year;owner</string>
-	<string name="library_headerview_author">Raphaël Bussa</string>
-	<string name="library_headerview_authorWebsite">http://rebus007.altervista.org</string>
-	<string name="library_headerview_libraryName">Header View</string>
-	<string name="library_headerview_libraryDescription">Create an header for android.support.design.widget.NavigationView</string>
-	<string name="library_headerview_libraryWebsite">http://rebus007.github.io/HeaderView/</string>
-	<string name="library_headerview_libraryVersion">@string/version</string>
-	<string name="library_headerview_isOpenSource">true</string>
-	<string name="library_headerview_repositoryLink">https://github.com/rebus007/HeaderView</string>
-	<string name="library_headerview_licenseId">mit</string>
-	<string name="library_headerview_owner">Raphaël Bussa</string>
-	<string name="library_headerview_year">2017</string>
+    <string name="define_headerview">year;owner</string>
+    <string name="library_headerview_author">Raphaël Bussa</string>
+    <string name="library_headerview_authorWebsite">http://rebus007.altervista.org</string>
+    <string name="library_headerview_libraryName">Header View</string>
+    <string name="library_headerview_libraryDescription">Create an header for android.support.design.widget.NavigationView</string>
+    <string name="library_headerview_libraryWebsite">http://rebus007.github.io/HeaderView/</string>
+    <string name="library_headerview_libraryVersion">@string/version</string>
+    <string name="library_headerview_isOpenSource">true</string>
+    <string name="library_headerview_repositoryLink">https://github.com/rebus007/HeaderView</string>
+    <string name="library_headerview_licenseId">mit</string>
+    <string name="library_headerview_owner">Raphaël Bussa</string>
+    <string name="library_headerview_year">2017</string>
 </resources>