diff --git a/README.md b/README.md
index 9d802b28..6f27877a 100644
--- a/README.md
+++ b/README.md
@@ -1,32 +1,49 @@
-# fxserver-esx_mecanojob
+# esx_mecanojob
 
-FXServer ESX Mecano Job
-
-[REQUIREMENTS]
+## Requirements
 
 * Auto mode
   * No need to download another resource
 
 * Player management (billing and boss actions)
-  * esx_society => https://github.com/FXServer-ESX/fxserver-esx_society
-  * esx_billing => https://github.com/FXServer-ESX/fxserver-esx_billing
+  * [esx_society](https://github.com/ESX-Org/esx_society)
+  * [esx_billing](https://github.com/ESX-Org/esx_billing)
 
-[INSTALLATION]
+## Download & Installation
 
-1) CD in your resources/[esx] folder
-2) Clone the repository
+### Using [fvm](https://github.com/qlaffont/fvm-installer)
 ```
-git clone https://github.com/FXServer-ESX/fxserver-esx_mecanojob esx_mecanojob
+fvm install --save --folder=esx esx-org/esx_mecanojob
 ```
-3) Import esx_mecanojob.sql in your database
 
-4) Add this in your server.cfg :
+### Using Git
+```
+cd resources
+git clone https://github.com/ESX-Org/esx_mecanojob [esx]/esx_mecanojob
+```
+
+### Manually
+- Download https://github.com/ESX-Org/esx_mecanojob/archive/master.zip
+- Put it in the `[esx]` directory
+
+
+## Installation
+- Import `esx_mecanojob.sql` in your database
+- If you want player management you have to set `Config.EnablePlayerManagement` to `true` in `config.lua`
+- Add this to your `server.cfg`:
 
 ```
 start esx_mecanojob
 ```
-5) If you want player management you have to set Config.EnablePlayerManagement to true in config.lua
 
-[KNOWN BUGS]
+# Legal
+### License
+esx_mecanojob - mechanic job for ESX
 
-* Props spawn don't work at all
+Copyright (C) 2015-2018 Jérémie N'gadi
+
+This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
+
+This program Is distributed In the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty Of MERCHANTABILITY Or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License For more details.
+
+You should have received a copy Of the GNU General Public License along with this program. If Not, see http://www.gnu.org/licenses/.
\ No newline at end of file
diff --git a/client/main.lua b/client/main.lua
index 0c9347e1..a12debb2 100644
--- a/client/main.lua
+++ b/client/main.lua
@@ -11,14 +11,12 @@ local Keys = {
 }
 
 local PlayerData              = {}
-local GUI                     = {}
 local HasAlreadyEnteredMarker = false
 local LastZone                = nil
 local CurrentAction           = nil
 local CurrentActionMsg        = ''
 local CurrentActionData       = {}
 local OnJob                   = false
-local TargetCoords            = nil
 local CurrentlyTowedVehicle   = nil
 local Blips                   = {}
 local NPCOnJob                = false
@@ -31,7 +29,6 @@ local NPCTargetDeleterZone    = false
 local IsDead                  = false
 
 ESX                           = nil
-GUI.Time                      = 0
 
 Citizen.CreateThread(function()
 	while ESX == nil do
@@ -164,7 +161,7 @@ function OpenMecanoActionsMenu()
           else
 
             local elements = {
-              {label = _U('flat_bed'), value = 'flatbed'},
+              {label = _U('flat_bed'),  value = 'flatbed'},
               {label = _U('tow_truck'), value = 'towtruck2'}
             }
 
@@ -365,12 +362,12 @@ function OpenMobileMecanoActionsMenu()
       title    = _U('mechanic'),
       align    = 'top-left',
       elements = {
-        {label = _U('billing'),    value = 'billing'},
-        {label = _U('hijack'),     value = 'hijack_vehicle'},
-        {label = _U('repair'),       value = 'fix_vehicle'},
-        {label = _U('clean'),      value = 'clean_vehicle'},
-        {label = _U('imp_veh'),     value = 'del_vehicle'},
-        {label = _U('flat_bed'),       value = 'dep_vehicle'},
+        {label = _U('billing'),       value = 'billing'},
+        {label = _U('hijack'),        value = 'hijack_vehicle'},
+        {label = _U('repair'),        value = 'fix_vehicle'},
+        {label = _U('clean'),         value = 'clean_vehicle'},
+        {label = _U('imp_veh'),       value = 'del_vehicle'},
+        {label = _U('flat_bed'),      value = 'dep_vehicle'},
         {label = _U('place_objects'), value = 'object_spawner'}
       }
     },
@@ -1196,7 +1193,7 @@ Citizen.CreateThread(function()
 
             local playerPed = GetPlayerPed(-1)
 
-            if IsPedInAnyVehicle(playerPed,  false) and IsVehicleModel(GetVehiclePedIsIn(playerPed,  false), GetHashKey("flatbed")) then
+            if IsPedInAnyVehicle(playerPed, false) and IsVehicleModel(GetVehiclePedIsIn(playerPed, false), GetHashKey("flatbed")) then
               StartNPCJob()
             else
               ESX.ShowNotification(_U('must_in_flatbed'))
diff --git a/esx_mecanojob.sql b/esx_mecanojob.sql
index 9bb4bf5d..03b45f44 100644
--- a/esx_mecanojob.sql
+++ b/esx_mecanojob.sql
@@ -16,7 +16,7 @@ INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_
 	('mecano',0,'recrue','Recrue',12,'{}','{}'),
 	('mecano',1,'novice','Novice',24,'{}','{}'),
 	('mecano',2,'experimente','Experimente',36,'{}','{}'),
-	('mecano',3,'chief','Chef d\'équipe',48,'{}','{}'),
+	('mecano',3,'chief',"Chef d\'équipe",48,'{}','{}'),
 	('mecano',4,'boss','Patron',0,'{}','{}')
 ;