diff --git a/client/main.lua b/client/main.lua
index 74dd7f76..6b8bf6f6 100644
--- a/client/main.lua
+++ b/client/main.lua
@@ -254,7 +254,6 @@ RegisterNetEvent('esx:loadIPL')
 AddEventHandler('esx:loadIPL', function(name)
 	Citizen.CreateThread(function()
 		LoadMpDlcMaps()
-		EnableMpDlcMaps(true)
 		RequestIpl(name)
 	end)
 end)
diff --git a/server/classes/player.lua b/server/classes/player.lua
index 3c949697..1224407c 100644
--- a/server/classes/player.lua
+++ b/server/classes/player.lua
@@ -48,8 +48,8 @@ function CreateExtendedPlayer(player, accounts, inventory, job, loadout, name, l
 		self.player.coords = {x = x, y = y, z = z}
 	end
 
-	self.kick = function(r)
-		self.player.kick(r)
+	self.kick = function(reason)
+		self.player.kick(reason)
 	end
 
 	self.addMoney = function(money)
@@ -237,8 +237,7 @@ function CreateExtendedPlayer(player, accounts, inventory, job, loadout, name, l
 
 	self.createAccounts = function(missingAccounts, cb)
 		for i=1, #missingAccounts, 1 do
-			MySQL.Async.execute('INSERT INTO `user_accounts` (identifier, name) VALUES (@identifier, @name)',
-			{
+			MySQL.Async.execute('INSERT INTO `user_accounts` (identifier, name) VALUES (@identifier, @name)', {
 				['@identifier'] = self.getIdentifier(),
 				['@name']       = missingAccounts[i]
 			}, function(rowsChanged)
@@ -317,8 +316,8 @@ function CreateExtendedPlayer(player, accounts, inventory, job, loadout, name, l
 		local newCount = item.count + count
 		item.count     = newCount
 
-		TriggerEvent("esx:onAddInventoryItem", self.source, item, count)
-		TriggerClientEvent("esx:addInventoryItem", self.source, item, count)
+		TriggerEvent('esx:onAddInventoryItem', self.source, item, count)
+		TriggerClientEvent('esx:addInventoryItem', self.source, item, count)
 	end
 
 	self.removeInventoryItem = function(name, count)
@@ -326,8 +325,8 @@ function CreateExtendedPlayer(player, accounts, inventory, job, loadout, name, l
 		local newCount = item.count - count
 		item.count     = newCount
 
-		TriggerEvent("esx:onRemoveInventoryItem", self.source, item, count)
-		TriggerClientEvent("esx:removeInventoryItem", self.source, item, count)
+		TriggerEvent('esx:onRemoveInventoryItem', self.source, item, count)
+		TriggerClientEvent('esx:removeInventoryItem', self.source, item, count)
 	end
 
 	self.setInventoryItem = function(name, count)
@@ -336,15 +335,14 @@ function CreateExtendedPlayer(player, accounts, inventory, job, loadout, name, l
 		item.count     = count
 
 		if oldCount > item.count  then
-			TriggerEvent("esx:onRemoveInventoryItem", self.source, item, oldCount - item.count)
-			TriggerClientEvent("esx:removeInventoryItem", self.source, item, oldCount - item.count)
+			TriggerEvent('esx:onRemoveInventoryItem', self.source, item, oldCount - item.count)
+			TriggerClientEvent('esx:removeInventoryItem', self.source, item, oldCount - item.count)
 		else
-			TriggerEvent("esx:onAddInventoryItem", self.source, item, item.count - oldCount)
-			TriggerClientEvent("esx:addInventoryItem", self.source, item, item.count - oldCount)
+			TriggerEvent('esx:onAddInventoryItem', self.source, item, item.count - oldCount)
+			TriggerClientEvent('esx:addInventoryItem', self.source, item, item.count - oldCount)
 		end
 	end
 
-	self.setJob = function(name, grade)
 	self.setJob = function(job, grade)
 		local lastJob = json.decode(json.encode(self.job))
 
diff --git a/server/functions.lua b/server/functions.lua
index a722f533..84c5c6ed 100644
--- a/server/functions.lua
+++ b/server/functions.lua
@@ -46,8 +46,7 @@ ESX.SavePlayer = function(xPlayer, cb)
 		if ESX.LastPlayerData[xPlayer.source].accounts[xPlayer.accounts[i].name] ~= xPlayer.accounts[i].money then
 
 			table.insert(asyncTasks, function(cb)
-				MySQL.Async.execute('UPDATE user_accounts SET `money` = @money WHERE identifier = @identifier AND name = @name',
-				{
+				MySQL.Async.execute('UPDATE user_accounts SET `money` = @money WHERE identifier = @identifier AND name = @name', {
 					['@money']      = xPlayer.accounts[i].money,
 					['@identifier'] = xPlayer.identifier,
 					['@name']       = xPlayer.accounts[i].name
@@ -68,8 +67,7 @@ ESX.SavePlayer = function(xPlayer, cb)
 		if ESX.LastPlayerData[xPlayer.source].items[xPlayer.inventory[i].name] ~= xPlayer.inventory[i].count then
 
 			table.insert(asyncTasks, function(cb)
-				MySQL.Async.execute('UPDATE user_inventory SET `count` = @count WHERE identifier = @identifier AND item = @item',
-				{
+				MySQL.Async.execute('UPDATE user_inventory SET `count` = @count WHERE identifier = @identifier AND item = @item', {
 					['@count']      = xPlayer.inventory[i].count,
 					['@identifier'] = xPlayer.identifier,
 					['@item']       = xPlayer.inventory[i].name
@@ -86,8 +84,7 @@ ESX.SavePlayer = function(xPlayer, cb)
 
 	-- Job, loadout and position
 	table.insert(asyncTasks, function(cb)
-		MySQL.Async.execute('UPDATE users SET `job` = @job, `job_grade` = @job_grade, `loadout` = @loadout, `position` = @position WHERE identifier = @identifier',
-		{
+		MySQL.Async.execute('UPDATE users SET `job` = @job, `job_grade` = @job_grade, `loadout` = @loadout, `position` = @position WHERE identifier = @identifier', {
 			['@job']        = xPlayer.job.name,
 			['@job_grade']  = xPlayer.job.grade,
 			['@loadout']    = json.encode(xPlayer.getLoadout()),