diff --git a/zone/perl_player_corpse.cpp b/zone/perl_player_corpse.cpp
index c16a05d57..69be0f48c 100644
--- a/zone/perl_player_corpse.cpp
+++ b/zone/perl_player_corpse.cpp
@@ -26,7 +26,9 @@
 */
 
 #include "../common/features.h"
+
 #ifdef EMBPERL_XS_CLASSES
+
 #include "../common/global_define.h"
 #include "embperl.h"
 
@@ -42,73 +44,69 @@
 
 
 XS(XS_Corpse_GetCharID); /* prototype to pass -Wmissing-prototypes */
-XS(XS_Corpse_GetCharID)
-{
+XS(XS_Corpse_GetCharID) {
 	dXSARGS;
 	if (items != 1)
 		Perl_croak(aTHX_ "Usage: Corpse::GetCharID(THIS)");
 	{
-		Corpse *		THIS;
-		uint32		RETVAL;
+		Corpse *THIS;
+		uint32 RETVAL;
 		dXSTARG;
 
 		if (sv_derived_from(ST(0), "Corpse")) {
-			IV tmp = SvIV((SV*)SvRV(ST(0)));
-			THIS = INT2PTR(Corpse *,tmp);
-		}
-		else
+			IV tmp = SvIV((SV *) SvRV(ST(0)));
+			THIS = INT2PTR(Corpse *, tmp);
+		} else
 			Perl_croak(aTHX_ "THIS is not of type Corpse");
-		if(THIS == nullptr)
+		if (THIS == nullptr)
 			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		RETVAL = THIS->GetCharID();
-		XSprePUSH; PUSHu((UV)RETVAL);
+		XSprePUSH;
+		PUSHu((UV) RETVAL);
 	}
 	XSRETURN(1);
 }
 
 XS(XS_Corpse_GetDecayTime); /* prototype to pass -Wmissing-prototypes */
-XS(XS_Corpse_GetDecayTime)
-{
+XS(XS_Corpse_GetDecayTime) {
 	dXSARGS;
 	if (items != 1)
 		Perl_croak(aTHX_ "Usage: Corpse::GetDecayTime(THIS)");
 	{
-		Corpse *		THIS;
-		uint32		RETVAL;
+		Corpse *THIS;
+		uint32 RETVAL;
 		dXSTARG;
 
 		if (sv_derived_from(ST(0), "Corpse")) {
-			IV tmp = SvIV((SV*)SvRV(ST(0)));
-			THIS = INT2PTR(Corpse *,tmp);
-		}
-		else
+			IV tmp = SvIV((SV *) SvRV(ST(0)));
+			THIS = INT2PTR(Corpse *, tmp);
+		} else
 			Perl_croak(aTHX_ "THIS is not of type Corpse");
-		if(THIS == nullptr)
+		if (THIS == nullptr)
 			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		RETVAL = THIS->GetDecayTime();
-		XSprePUSH; PUSHu((UV)RETVAL);
+		XSprePUSH;
+		PUSHu((UV) RETVAL);
 	}
 	XSRETURN(1);
 }
 
 XS(XS_Corpse_Lock); /* prototype to pass -Wmissing-prototypes */
-XS(XS_Corpse_Lock)
-{
+XS(XS_Corpse_Lock) {
 	dXSARGS;
 	if (items != 1)
 		Perl_croak(aTHX_ "Usage: Corpse::Lock(THIS)");
 	{
-		Corpse *		THIS;
+		Corpse *THIS;
 
 		if (sv_derived_from(ST(0), "Corpse")) {
-			IV tmp = SvIV((SV*)SvRV(ST(0)));
-			THIS = INT2PTR(Corpse *,tmp);
-		}
-		else
+			IV tmp = SvIV((SV *) SvRV(ST(0)));
+			THIS = INT2PTR(Corpse *, tmp);
+		} else
 			Perl_croak(aTHX_ "THIS is not of type Corpse");
-		if(THIS == nullptr)
+		if (THIS == nullptr)
 			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		THIS->Lock();
@@ -117,21 +115,19 @@ XS(XS_Corpse_Lock)
 }
 
 XS(XS_Corpse_UnLock); /* prototype to pass -Wmissing-prototypes */
-XS(XS_Corpse_UnLock)
-{
+XS(XS_Corpse_UnLock) {
 	dXSARGS;
 	if (items != 1)
 		Perl_croak(aTHX_ "Usage: Corpse::UnLock(THIS)");
 	{
-		Corpse *		THIS;
+		Corpse *THIS;
 
 		if (sv_derived_from(ST(0), "Corpse")) {
-			IV tmp = SvIV((SV*)SvRV(ST(0)));
-			THIS = INT2PTR(Corpse *,tmp);
-		}
-		else
+			IV tmp = SvIV((SV *) SvRV(ST(0)));
+			THIS = INT2PTR(Corpse *, tmp);
+		} else
 			Perl_croak(aTHX_ "THIS is not of type Corpse");
-		if(THIS == nullptr)
+		if (THIS == nullptr)
 			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		THIS->UnLock();
@@ -140,22 +136,20 @@ XS(XS_Corpse_UnLock)
 }
 
 XS(XS_Corpse_IsLocked); /* prototype to pass -Wmissing-prototypes */
-XS(XS_Corpse_IsLocked)
-{
+XS(XS_Corpse_IsLocked) {
 	dXSARGS;
 	if (items != 1)
 		Perl_croak(aTHX_ "Usage: Corpse::IsLocked(THIS)");
 	{
-		Corpse *		THIS;
-		bool		RETVAL;
+		Corpse *THIS;
+		bool RETVAL;
 
 		if (sv_derived_from(ST(0), "Corpse")) {
-			IV tmp = SvIV((SV*)SvRV(ST(0)));
-			THIS = INT2PTR(Corpse *,tmp);
-		}
-		else
+			IV tmp = SvIV((SV *) SvRV(ST(0)));
+			THIS = INT2PTR(Corpse *, tmp);
+		} else
 			Perl_croak(aTHX_ "THIS is not of type Corpse");
-		if(THIS == nullptr)
+		if (THIS == nullptr)
 			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		RETVAL = THIS->IsLocked();
@@ -166,21 +160,19 @@ XS(XS_Corpse_IsLocked)
 }
 
 XS(XS_Corpse_ResetLooter); /* prototype to pass -Wmissing-prototypes */
-XS(XS_Corpse_ResetLooter)
-{
+XS(XS_Corpse_ResetLooter) {
 	dXSARGS;
 	if (items != 1)
 		Perl_croak(aTHX_ "Usage: Corpse::ResetLooter(THIS)");
 	{
-		Corpse *		THIS;
+		Corpse *THIS;
 
 		if (sv_derived_from(ST(0), "Corpse")) {
-			IV tmp = SvIV((SV*)SvRV(ST(0)));
-			THIS = INT2PTR(Corpse *,tmp);
-		}
-		else
+			IV tmp = SvIV((SV *) SvRV(ST(0)));
+			THIS = INT2PTR(Corpse *, tmp);
+		} else
 			Perl_croak(aTHX_ "THIS is not of type Corpse");
-		if(THIS == nullptr)
+		if (THIS == nullptr)
 			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		THIS->ResetLooter();
@@ -189,74 +181,71 @@ XS(XS_Corpse_ResetLooter)
 }
 
 XS(XS_Corpse_GetDBID); /* prototype to pass -Wmissing-prototypes */
-XS(XS_Corpse_GetDBID)
-{
+XS(XS_Corpse_GetDBID) {
 	dXSARGS;
 	if (items != 1)
 		Perl_croak(aTHX_ "Usage: Corpse::GetDBID(THIS)");
 	{
-		Corpse *		THIS;
-		uint32		RETVAL;
+		Corpse *THIS;
+		uint32 RETVAL;
 		dXSTARG;
 
 		if (sv_derived_from(ST(0), "Corpse")) {
-			IV tmp = SvIV((SV*)SvRV(ST(0)));
-			THIS = INT2PTR(Corpse *,tmp);
-		}
-		else
+			IV tmp = SvIV((SV *) SvRV(ST(0)));
+			THIS = INT2PTR(Corpse *, tmp);
+		} else
 			Perl_croak(aTHX_ "THIS is not of type Corpse");
-		if(THIS == nullptr)
+		if (THIS == nullptr)
 			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		RETVAL = THIS->GetCorpseDBID();
-		XSprePUSH; PUSHu((UV)RETVAL);
+		XSprePUSH;
+		PUSHu((UV) RETVAL);
 	}
 	XSRETURN(1);
 }
 
 XS(XS_Corpse_GetOwnerName); /* prototype to pass -Wmissing-prototypes */
-XS(XS_Corpse_GetOwnerName)
-{
+XS(XS_Corpse_GetOwnerName) {
 	dXSARGS;
 	if (items != 1)
 		Perl_croak(aTHX_ "Usage: Corpse::GetOwnerName(THIS)");
 	{
-		Corpse *		THIS;
-		char *		RETVAL;
+		Corpse *THIS;
+		char   *RETVAL;
 		dXSTARG;
 
 		if (sv_derived_from(ST(0), "Corpse")) {
-			IV tmp = SvIV((SV*)SvRV(ST(0)));
-			THIS = INT2PTR(Corpse *,tmp);
-		}
-		else
+			IV tmp = SvIV((SV *) SvRV(ST(0)));
+			THIS = INT2PTR(Corpse *, tmp);
+		} else
 			Perl_croak(aTHX_ "THIS is not of type Corpse");
-		if(THIS == nullptr)
+		if (THIS == nullptr)
 			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		RETVAL = THIS->GetOwnerName();
-		sv_setpv(TARG, RETVAL); XSprePUSH; PUSHTARG;
+		sv_setpv(TARG, RETVAL);
+		XSprePUSH;
+		PUSHTARG;
 	}
 	XSRETURN(1);
 }
 
 XS(XS_Corpse_SetDecayTimer); /* prototype to pass -Wmissing-prototypes */
-XS(XS_Corpse_SetDecayTimer)
-{
+XS(XS_Corpse_SetDecayTimer) {
 	dXSARGS;
 	if (items != 2)
 		Perl_croak(aTHX_ "Usage: Corpse::SetDecayTimer(THIS, uint32 decay_time)");
 	{
-		Corpse *		THIS;
-		uint32		decaytime = (uint32)SvUV(ST(1));
+		Corpse *THIS;
+		uint32 decaytime = (uint32) SvUV(ST(1));
 
 		if (sv_derived_from(ST(0), "Corpse")) {
-			IV tmp = SvIV((SV*)SvRV(ST(0)));
-			THIS = INT2PTR(Corpse *,tmp);
-		}
-		else
+			IV tmp = SvIV((SV *) SvRV(ST(0)));
+			THIS = INT2PTR(Corpse *, tmp);
+		} else
 			Perl_croak(aTHX_ "THIS is not of type Corpse");
-		if(THIS == nullptr)
+		if (THIS == nullptr)
 			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		THIS->SetDecayTimer(decaytime);
@@ -265,22 +254,20 @@ XS(XS_Corpse_SetDecayTimer)
 }
 
 XS(XS_Corpse_IsEmpty); /* prototype to pass -Wmissing-prototypes */
-XS(XS_Corpse_IsEmpty)
-{
+XS(XS_Corpse_IsEmpty) {
 	dXSARGS;
 	if (items != 1)
 		Perl_croak(aTHX_ "Usage: Corpse::IsEmpty(THIS)");
 	{
-		Corpse *		THIS;
-		bool		RETVAL;
+		Corpse *THIS;
+		bool RETVAL;
 
 		if (sv_derived_from(ST(0), "Corpse")) {
-			IV tmp = SvIV((SV*)SvRV(ST(0)));
-			THIS = INT2PTR(Corpse *,tmp);
-		}
-		else
+			IV tmp = SvIV((SV *) SvRV(ST(0)));
+			THIS = INT2PTR(Corpse *, tmp);
+		} else
 			Perl_croak(aTHX_ "THIS is not of type Corpse");
-		if(THIS == nullptr)
+		if (THIS == nullptr)
 			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		RETVAL = THIS->IsEmpty();
@@ -291,30 +278,28 @@ XS(XS_Corpse_IsEmpty)
 }
 
 XS(XS_Corpse_AddItem); /* prototype to pass -Wmissing-prototypes */
-XS(XS_Corpse_AddItem)
-{
+XS(XS_Corpse_AddItem) {
 	dXSARGS;
 	if (items < 3 || items > 4)
 		Perl_croak(aTHX_ "Usage: Corpse::AddItem(THIS, uint32 item_id, uint16 charges, [unt16 slot = 0])");
 	{
-		Corpse *		THIS;
-		uint32		itemnum = (uint32)SvUV(ST(1));
-		uint16		charges = (uint16)SvUV(ST(2));
-		int16		slot;
+		Corpse *THIS;
+		uint32 itemnum = (uint32) SvUV(ST(1));
+		uint16 charges = (uint16) SvUV(ST(2));
+		int16  slot;
 
 		if (sv_derived_from(ST(0), "Corpse")) {
-			IV tmp = SvIV((SV*)SvRV(ST(0)));
-			THIS = INT2PTR(Corpse *,tmp);
-		}
-		else
+			IV tmp = SvIV((SV *) SvRV(ST(0)));
+			THIS = INT2PTR(Corpse *, tmp);
+		} else
 			Perl_croak(aTHX_ "THIS is not of type Corpse");
-		if(THIS == nullptr)
+		if (THIS == nullptr)
 			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		if (items < 4)
 			slot = 0;
 		else {
-			slot = (int16)SvIV(ST(3));
+			slot = (int16) SvIV(ST(3));
 		}
 
 		THIS->AddItem(itemnum, charges, slot);
@@ -323,49 +308,46 @@ XS(XS_Corpse_AddItem)
 }
 
 XS(XS_Corpse_GetWornItem); /* prototype to pass -Wmissing-prototypes */
-XS(XS_Corpse_GetWornItem)
-{
+XS(XS_Corpse_GetWornItem) {
 	dXSARGS;
 	if (items != 2)
 		Perl_croak(aTHX_ "Usage: Corpse::GetWornItem(THIS, equipSlot)");
 	{
-		Corpse *		THIS;
-		uint32		RETVAL;
+		Corpse *THIS;
+		uint32 RETVAL;
 		dXSTARG;
-		int16		equipSlot = (int16)SvIV(ST(1));
+		int16  equipSlot = (int16) SvIV(ST(1));
 
 		if (sv_derived_from(ST(0), "Corpse")) {
-			IV tmp = SvIV((SV*)SvRV(ST(0)));
-			THIS = INT2PTR(Corpse *,tmp);
-		}
-		else
+			IV tmp = SvIV((SV *) SvRV(ST(0)));
+			THIS = INT2PTR(Corpse *, tmp);
+		} else
 			Perl_croak(aTHX_ "THIS is not of type Corpse");
-		if(THIS == nullptr)
+		if (THIS == nullptr)
 			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		RETVAL = THIS->GetWornItem(equipSlot);
-		XSprePUSH; PUSHu((UV)RETVAL);
+		XSprePUSH;
+		PUSHu((UV) RETVAL);
 	}
 	XSRETURN(1);
 }
 
 XS(XS_Corpse_RemoveItem); /* prototype to pass -Wmissing-prototypes */
-XS(XS_Corpse_RemoveItem)
-{
+XS(XS_Corpse_RemoveItem) {
 	dXSARGS;
 	if (items != 2)
 		Perl_croak(aTHX_ "Usage: Corpse::RemoveItem(THIS, uint16 loot_slot)");
 	{
-		Corpse *		THIS;
-		uint16		lootslot = (uint16)SvUV(ST(1));
+		Corpse *THIS;
+		uint16 lootslot = (uint16) SvUV(ST(1));
 
 		if (sv_derived_from(ST(0), "Corpse")) {
-			IV tmp = SvIV((SV*)SvRV(ST(0)));
-			THIS = INT2PTR(Corpse *,tmp);
-		}
-		else
+			IV tmp = SvIV((SV *) SvRV(ST(0)));
+			THIS = INT2PTR(Corpse *, tmp);
+		} else
 			Perl_croak(aTHX_ "THIS is not of type Corpse");
-		if(THIS == nullptr)
+		if (THIS == nullptr)
 			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		THIS->RemoveItem(lootslot);
@@ -374,25 +356,23 @@ XS(XS_Corpse_RemoveItem)
 }
 
 XS(XS_Corpse_SetCash); /* prototype to pass -Wmissing-prototypes */
-XS(XS_Corpse_SetCash)
-{
+XS(XS_Corpse_SetCash) {
 	dXSARGS;
 	if (items != 5)
 		Perl_croak(aTHX_ "Usage: Corpse::SetCash(THIS, uint16 copper, uint16 silver, uint16 gold, uint16 platinum)");
 	{
-		Corpse *		THIS;
-		uint16		in_copper = (uint16)SvUV(ST(1));
-		uint16		in_silver = (uint16)SvUV(ST(2));
-		uint16		in_gold = (uint16)SvUV(ST(3));
-		uint16		in_platinum = (uint16)SvUV(ST(4));
+		Corpse *THIS;
+		uint16 in_copper   = (uint16) SvUV(ST(1));
+		uint16 in_silver   = (uint16) SvUV(ST(2));
+		uint16 in_gold     = (uint16) SvUV(ST(3));
+		uint16 in_platinum = (uint16) SvUV(ST(4));
 
 		if (sv_derived_from(ST(0), "Corpse")) {
-			IV tmp = SvIV((SV*)SvRV(ST(0)));
-			THIS = INT2PTR(Corpse *,tmp);
-		}
-		else
+			IV tmp = SvIV((SV *) SvRV(ST(0)));
+			THIS = INT2PTR(Corpse *, tmp);
+		} else
 			Perl_croak(aTHX_ "THIS is not of type Corpse");
-		if(THIS == nullptr)
+		if (THIS == nullptr)
 			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		THIS->SetCash(in_copper, in_silver, in_gold, in_platinum);
@@ -401,21 +381,19 @@ XS(XS_Corpse_SetCash)
 }
 
 XS(XS_Corpse_RemoveCash); /* prototype to pass -Wmissing-prototypes */
-XS(XS_Corpse_RemoveCash)
-{
+XS(XS_Corpse_RemoveCash) {
 	dXSARGS;
 	if (items != 1)
 		Perl_croak(aTHX_ "Usage: Corpse::RemoveCash(THIS)");
 	{
-		Corpse *		THIS;
+		Corpse *THIS;
 
 		if (sv_derived_from(ST(0), "Corpse")) {
-			IV tmp = SvIV((SV*)SvRV(ST(0)));
-			THIS = INT2PTR(Corpse *,tmp);
-		}
-		else
+			IV tmp = SvIV((SV *) SvRV(ST(0)));
+			THIS = INT2PTR(Corpse *, tmp);
+		} else
 			Perl_croak(aTHX_ "THIS is not of type Corpse");
-		if(THIS == nullptr)
+		if (THIS == nullptr)
 			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		THIS->RemoveCash();
@@ -424,47 +402,44 @@ XS(XS_Corpse_RemoveCash)
 }
 
 XS(XS_Corpse_CountItems); /* prototype to pass -Wmissing-prototypes */
-XS(XS_Corpse_CountItems)
-{
+XS(XS_Corpse_CountItems) {
 	dXSARGS;
 	if (items != 1)
 		Perl_croak(aTHX_ "Usage: Corpse::CountItems(THIS)");
 	{
-		Corpse *		THIS;
-		uint32		RETVAL;
+		Corpse *THIS;
+		uint32 RETVAL;
 		dXSTARG;
 
 		if (sv_derived_from(ST(0), "Corpse")) {
-			IV tmp = SvIV((SV*)SvRV(ST(0)));
-			THIS = INT2PTR(Corpse *,tmp);
-		}
-		else
+			IV tmp = SvIV((SV *) SvRV(ST(0)));
+			THIS = INT2PTR(Corpse *, tmp);
+		} else
 			Perl_croak(aTHX_ "THIS is not of type Corpse");
-		if(THIS == nullptr)
+		if (THIS == nullptr)
 			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		RETVAL = THIS->CountItems();
-		XSprePUSH; PUSHu((UV)RETVAL);
+		XSprePUSH;
+		PUSHu((UV) RETVAL);
 	}
 	XSRETURN(1);
 }
 
 XS(XS_Corpse_Delete); /* prototype to pass -Wmissing-prototypes */
-XS(XS_Corpse_Delete)
-{
+XS(XS_Corpse_Delete) {
 	dXSARGS;
 	if (items != 1)
 		Perl_croak(aTHX_ "Usage: Corpse::Delete(THIS)");
 	{
-		Corpse *		THIS;
+		Corpse *THIS;
 
 		if (sv_derived_from(ST(0), "Corpse")) {
-			IV tmp = SvIV((SV*)SvRV(ST(0)));
-			THIS = INT2PTR(Corpse *,tmp);
-		}
-		else
+			IV tmp = SvIV((SV *) SvRV(ST(0)));
+			THIS = INT2PTR(Corpse *, tmp);
+		} else
 			Perl_croak(aTHX_ "THIS is not of type Corpse");
-		if(THIS == nullptr)
+		if (THIS == nullptr)
 			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		THIS->Delete();
@@ -473,136 +448,129 @@ XS(XS_Corpse_Delete)
 }
 
 XS(XS_Corpse_GetCopper); /* prototype to pass -Wmissing-prototypes */
-XS(XS_Corpse_GetCopper)
-{
+XS(XS_Corpse_GetCopper) {
 	dXSARGS;
 	if (items != 1)
 		Perl_croak(aTHX_ "Usage: Corpse::GetCopper(THIS)");
 	{
-		Corpse *		THIS;
-		uint32		RETVAL;
+		Corpse *THIS;
+		uint32 RETVAL;
 		dXSTARG;
 
 		if (sv_derived_from(ST(0), "Corpse")) {
-			IV tmp = SvIV((SV*)SvRV(ST(0)));
-			THIS = INT2PTR(Corpse *,tmp);
-		}
-		else
+			IV tmp = SvIV((SV *) SvRV(ST(0)));
+			THIS = INT2PTR(Corpse *, tmp);
+		} else
 			Perl_croak(aTHX_ "THIS is not of type Corpse");
-		if(THIS == nullptr)
+		if (THIS == nullptr)
 			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		RETVAL = THIS->GetCopper();
-		XSprePUSH; PUSHu((UV)RETVAL);
+		XSprePUSH;
+		PUSHu((UV) RETVAL);
 	}
 	XSRETURN(1);
 }
 
 XS(XS_Corpse_GetSilver); /* prototype to pass -Wmissing-prototypes */
-XS(XS_Corpse_GetSilver)
-{
+XS(XS_Corpse_GetSilver) {
 	dXSARGS;
 	if (items != 1)
 		Perl_croak(aTHX_ "Usage: Corpse::GetSilver(THIS)");
 	{
-		Corpse *		THIS;
-		uint32		RETVAL;
+		Corpse *THIS;
+		uint32 RETVAL;
 		dXSTARG;
 
 		if (sv_derived_from(ST(0), "Corpse")) {
-			IV tmp = SvIV((SV*)SvRV(ST(0)));
-			THIS = INT2PTR(Corpse *,tmp);
-		}
-		else
+			IV tmp = SvIV((SV *) SvRV(ST(0)));
+			THIS = INT2PTR(Corpse *, tmp);
+		} else
 			Perl_croak(aTHX_ "THIS is not of type Corpse");
-		if(THIS == nullptr)
+		if (THIS == nullptr)
 			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		RETVAL = THIS->GetSilver();
-		XSprePUSH; PUSHu((UV)RETVAL);
+		XSprePUSH;
+		PUSHu((UV) RETVAL);
 	}
 	XSRETURN(1);
 }
 
 XS(XS_Corpse_GetGold); /* prototype to pass -Wmissing-prototypes */
-XS(XS_Corpse_GetGold)
-{
+XS(XS_Corpse_GetGold) {
 	dXSARGS;
 	if (items != 1)
 		Perl_croak(aTHX_ "Usage: Corpse::GetGold(THIS)");
 	{
-		Corpse *		THIS;
-		uint32		RETVAL;
+		Corpse *THIS;
+		uint32 RETVAL;
 		dXSTARG;
 
 		if (sv_derived_from(ST(0), "Corpse")) {
-			IV tmp = SvIV((SV*)SvRV(ST(0)));
-			THIS = INT2PTR(Corpse *,tmp);
-		}
-		else
+			IV tmp = SvIV((SV *) SvRV(ST(0)));
+			THIS = INT2PTR(Corpse *, tmp);
+		} else
 			Perl_croak(aTHX_ "THIS is not of type Corpse");
-		if(THIS == nullptr)
+		if (THIS == nullptr)
 			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		RETVAL = THIS->GetGold();
-		XSprePUSH; PUSHu((UV)RETVAL);
+		XSprePUSH;
+		PUSHu((UV) RETVAL);
 	}
 	XSRETURN(1);
 }
 
 XS(XS_Corpse_GetPlatinum); /* prototype to pass -Wmissing-prototypes */
-XS(XS_Corpse_GetPlatinum)
-{
+XS(XS_Corpse_GetPlatinum) {
 	dXSARGS;
 	if (items != 1)
 		Perl_croak(aTHX_ "Usage: Corpse::GetPlatinum(THIS)");
 	{
-		Corpse *		THIS;
-		uint32		RETVAL;
+		Corpse *THIS;
+		uint32 RETVAL;
 		dXSTARG;
 
 		if (sv_derived_from(ST(0), "Corpse")) {
-			IV tmp = SvIV((SV*)SvRV(ST(0)));
-			THIS = INT2PTR(Corpse *,tmp);
-		}
-		else
+			IV tmp = SvIV((SV *) SvRV(ST(0)));
+			THIS = INT2PTR(Corpse *, tmp);
+		} else
 			Perl_croak(aTHX_ "THIS is not of type Corpse");
-		if(THIS == nullptr)
+		if (THIS == nullptr)
 			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		RETVAL = THIS->GetPlatinum();
-		XSprePUSH; PUSHu((UV)RETVAL);
+		XSprePUSH;
+		PUSHu((UV) RETVAL);
 	}
 	XSRETURN(1);
 }
 
 XS(XS_Corpse_Summon); /* prototype to pass -Wmissing-prototypes */
-XS(XS_Corpse_Summon)
-{
+XS(XS_Corpse_Summon) {
 	dXSARGS;
 	if (items != 3)
 		Perl_croak(aTHX_ "Usage: Corpse::Summon(THIS, Client* client, bool is_spell)");
 	{
-		Corpse *		THIS;
-		Client*		client;
-		bool		spell = (bool)SvTRUE(ST(2));
+		Corpse *THIS;
+		Client *client;
+		bool spell = (bool) SvTRUE(ST(2));
 
 		if (sv_derived_from(ST(0), "Corpse")) {
-			IV tmp = SvIV((SV*)SvRV(ST(0)));
-			THIS = INT2PTR(Corpse *,tmp);
-		}
-		else
+			IV tmp = SvIV((SV *) SvRV(ST(0)));
+			THIS = INT2PTR(Corpse *, tmp);
+		} else
 			Perl_croak(aTHX_ "THIS is not of type Corpse");
-		if(THIS == nullptr)
+		if (THIS == nullptr)
 			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		if (sv_derived_from(ST(1), "Client")) {
-			IV tmp = SvIV((SV*)SvRV(ST(1)));
-			client = INT2PTR(Client *,tmp);
-		}
-		else
+			IV tmp = SvIV((SV *) SvRV(ST(1)));
+			client = INT2PTR(Client *, tmp);
+		} else
 			Perl_croak(aTHX_ "client is not of type Client");
-		if(client == nullptr)
+		if (client == nullptr)
 			Perl_croak(aTHX_ "client is nullptr, avoiding crash.");
 
 		THIS->Summon(client, spell, true);
@@ -611,32 +579,29 @@ XS(XS_Corpse_Summon)
 }
 
 XS(XS_Corpse_CastRezz); /* prototype to pass -Wmissing-prototypes */
-XS(XS_Corpse_CastRezz)
-{
+XS(XS_Corpse_CastRezz) {
 	dXSARGS;
 	if (items != 3)
 		Perl_croak(aTHX_ "Usage: Corpse::CastRezz(THIS, uint16 spell_id, [Mob* caster = nullptr])");
 	{
-		Corpse *		THIS;
-		uint16		spellid = (uint16)SvUV(ST(1));
-		Mob*		Caster;
+		Corpse *THIS;
+		uint16 spellid = (uint16) SvUV(ST(1));
+		Mob *Caster;
 
 		if (sv_derived_from(ST(0), "Corpse")) {
-			IV tmp = SvIV((SV*)SvRV(ST(0)));
-			THIS = INT2PTR(Corpse *,tmp);
-		}
-		else
+			IV tmp = SvIV((SV *) SvRV(ST(0)));
+			THIS = INT2PTR(Corpse *, tmp);
+		} else
 			Perl_croak(aTHX_ "THIS is not of type Corpse");
-		if(THIS == nullptr)
+		if (THIS == nullptr)
 			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		if (sv_derived_from(ST(2), "Mob")) {
-			IV tmp = SvIV((SV*)SvRV(ST(2)));
-			Caster = INT2PTR(Mob *,tmp);
-		}
-		else
+			IV tmp = SvIV((SV *) SvRV(ST(2)));
+			Caster = INT2PTR(Mob *, tmp);
+		} else
 			Perl_croak(aTHX_ "Caster is not of type Mob");
-		if(Caster == nullptr)
+		if (Caster == nullptr)
 			Perl_croak(aTHX_ "Caster is nullptr, avoiding crash.");
 
 		THIS->CastRezz(spellid, Caster);
@@ -645,21 +610,19 @@ XS(XS_Corpse_CastRezz)
 }
 
 XS(XS_Corpse_CompleteRezz); /* prototype to pass -Wmissing-prototypes */
-XS(XS_Corpse_CompleteRezz)
-{
+XS(XS_Corpse_CompleteRezz) {
 	dXSARGS;
 	if (items != 1)
 		Perl_croak(aTHX_ "Usage: Corpse::CompleteRezz(THIS)");
 	{
-		Corpse *		THIS;
+		Corpse *THIS;
 
 		if (sv_derived_from(ST(0), "Corpse")) {
-			IV tmp = SvIV((SV*)SvRV(ST(0)));
-			THIS = INT2PTR(Corpse *,tmp);
-		}
-		else
+			IV tmp = SvIV((SV *) SvRV(ST(0)));
+			THIS = INT2PTR(Corpse *, tmp);
+		} else
 			Perl_croak(aTHX_ "THIS is not of type Corpse");
-		if(THIS == nullptr)
+		if (THIS == nullptr)
 			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		THIS->CompleteResurrection();
@@ -668,59 +631,54 @@ XS(XS_Corpse_CompleteRezz)
 }
 
 XS(XS_Corpse_CanMobLoot); /* prototype to pass -Wmissing-prototypes */
-XS(XS_Corpse_CanMobLoot)
-{
+XS(XS_Corpse_CanMobLoot) {
 	dXSARGS;
 	if (items != 2)
 		Perl_croak(aTHX_ "Usage: Corpse::CanMobLoot(THIS, int character_id)");
 	{
-		Corpse *		THIS;
-		bool		RETVAL;
-		int		charid = (int)SvIV(ST(1));
+		Corpse *THIS;
+		bool RETVAL;
+		int  charid = (int) SvIV(ST(1));
 
 		if (sv_derived_from(ST(0), "Corpse")) {
-			IV tmp = SvIV((SV*)SvRV(ST(0)));
-			THIS = INT2PTR(Corpse *,tmp);
-		}
-		else
+			IV tmp = SvIV((SV *) SvRV(ST(0)));
+			THIS = INT2PTR(Corpse *, tmp);
+		} else
 			Perl_croak(aTHX_ "THIS is not of type Corpse");
-		if(THIS == nullptr)
+		if (THIS == nullptr)
 			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		RETVAL = THIS->CanPlayerLoot(charid);
-		ST(0) = boolSV(RETVAL);
+		ST(0)       = boolSV(RETVAL);
 		sv_2mortal(ST(0));
 	}
 	XSRETURN(1);
 }
 
 XS(XS_Corpse_AllowMobLoot); /* prototype to pass -Wmissing-prototypes */
-XS(XS_Corpse_AllowMobLoot)
-{
+XS(XS_Corpse_AllowMobLoot) {
 	dXSARGS;
 	if (items != 3)
 		Perl_croak(aTHX_ "Usage: Corpse::AllowMobLoot(THIS, Mob* them, uint8 slot)");
 	{
-		Corpse *		THIS;
-		Mob *		them;
-		uint8		slot = (uint8)SvUV(ST(2));
+		Corpse *THIS;
+		Mob    *them;
+		uint8 slot = (uint8) SvUV(ST(2));
 
 		if (sv_derived_from(ST(0), "Corpse")) {
-			IV tmp = SvIV((SV*)SvRV(ST(0)));
-			THIS = INT2PTR(Corpse *,tmp);
-		}
-		else
+			IV tmp = SvIV((SV *) SvRV(ST(0)));
+			THIS = INT2PTR(Corpse *, tmp);
+		} else
 			Perl_croak(aTHX_ "THIS is not of type Corpse");
-		if(THIS == nullptr)
+		if (THIS == nullptr)
 			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		if (sv_derived_from(ST(1), "Mob")) {
-			IV tmp = SvIV((SV*)SvRV(ST(1)));
-			them = INT2PTR(Mob *,tmp);
-		}
-		else
+			IV tmp = SvIV((SV *) SvRV(ST(1)));
+			them = INT2PTR(Mob *, tmp);
+		} else
 			Perl_croak(aTHX_ "them is not of type Mob");
-		if(them == nullptr)
+		if (them == nullptr)
 			Perl_croak(aTHX_ "them is nullptr, avoiding crash.");
 
 		THIS->AllowPlayerLoot(them, slot);
@@ -729,31 +687,28 @@ XS(XS_Corpse_AllowMobLoot)
 }
 
 XS(XS_Corpse_AddLooter); /* prototype to pass -Wmissing-prototypes */
-XS(XS_Corpse_AddLooter)
-{
+XS(XS_Corpse_AddLooter) {
 	dXSARGS;
 	if (items != 2)
 		Perl_croak(aTHX_ "Usage: Corpse::AddLooter(THIS, Mob* who)");
 	{
-		Corpse *		THIS;
-		Mob *		who;
+		Corpse *THIS;
+		Mob    *who;
 
 		if (sv_derived_from(ST(0), "Corpse")) {
-			IV tmp = SvIV((SV*)SvRV(ST(0)));
-			THIS = INT2PTR(Corpse *,tmp);
-		}
-		else
+			IV tmp = SvIV((SV *) SvRV(ST(0)));
+			THIS = INT2PTR(Corpse *, tmp);
+		} else
 			Perl_croak(aTHX_ "THIS is not of type Corpse");
-		if(THIS == nullptr)
+		if (THIS == nullptr)
 			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		if (sv_derived_from(ST(1), "Mob")) {
-			IV tmp = SvIV((SV*)SvRV(ST(1)));
-			who = INT2PTR(Mob *,tmp);
-		}
-		else
+			IV tmp = SvIV((SV *) SvRV(ST(1)));
+			who = INT2PTR(Mob *, tmp);
+		} else
 			Perl_croak(aTHX_ "who is not of type Mob");
-		if(who == nullptr)
+		if (who == nullptr)
 			Perl_croak(aTHX_ "who is nullptr, avoiding crash.");
 
 		THIS->AddLooter(who);
@@ -762,22 +717,20 @@ XS(XS_Corpse_AddLooter)
 }
 
 XS(XS_Corpse_IsRezzed); /* prototype to pass -Wmissing-prototypes */
-XS(XS_Corpse_IsRezzed)
-{
+XS(XS_Corpse_IsRezzed) {
 	dXSARGS;
 	if (items != 1)
 		Perl_croak(aTHX_ "Usage: Corpse::IsRezzed(THIS)");
 	{
-		Corpse *		THIS;
-		bool		RETVAL;
+		Corpse *THIS;
+		bool RETVAL;
 
 		if (sv_derived_from(ST(0), "Corpse")) {
-			IV tmp = SvIV((SV*)SvRV(ST(0)));
-			THIS = INT2PTR(Corpse *,tmp);
-		}
-		else
+			IV tmp = SvIV((SV *) SvRV(ST(0)));
+			THIS = INT2PTR(Corpse *, tmp);
+		} else
 			Perl_croak(aTHX_ "THIS is not of type Corpse");
-		if(THIS == nullptr)
+		if (THIS == nullptr)
 			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
 		RETVAL = THIS->IsRezzed();
@@ -791,49 +744,48 @@ XS(XS_Corpse_IsRezzed)
 extern "C"
 #endif
 XS(boot_Corpse); /* prototype to pass -Wmissing-prototypes */
-XS(boot_Corpse)
-{
+XS(boot_Corpse) {
 	dXSARGS;
 	char file[256];
 	strncpy(file, __FILE__, 256);
 	file[255] = 0;
 
-	if(items != 1)
+	if (items != 1)
 		fprintf(stderr, "boot_quest does not take any arguments.");
 	char buf[128];
 
 	//add the strcpy stuff to get rid of const warnings....
 
-	XS_VERSION_BOOTCHECK ;
+	XS_VERSION_BOOTCHECK;
 
-		newXSproto(strcpy(buf, "GetCharID"), XS_Corpse_GetCharID, file, "$");
-		newXSproto(strcpy(buf, "GetDecayTime"), XS_Corpse_GetDecayTime, file, "$");
-		newXSproto(strcpy(buf, "Lock"), XS_Corpse_Lock, file, "$");
-		newXSproto(strcpy(buf, "UnLock"), XS_Corpse_UnLock, file, "$");
-		newXSproto(strcpy(buf, "IsLocked"), XS_Corpse_IsLocked, file, "$");
-		newXSproto(strcpy(buf, "ResetLooter"), XS_Corpse_ResetLooter, file, "$");
-		newXSproto(strcpy(buf, "GetDBID"), XS_Corpse_GetDBID, file, "$");
-		newXSproto(strcpy(buf, "GetOwnerName"), XS_Corpse_GetOwnerName, file, "$");
-		newXSproto(strcpy(buf, "SetDecayTimer"), XS_Corpse_SetDecayTimer, file, "$$");
-		newXSproto(strcpy(buf, "IsEmpty"), XS_Corpse_IsEmpty, file, "$");
-		newXSproto(strcpy(buf, "AddItem"), XS_Corpse_AddItem, file, "$$$;$");
-		newXSproto(strcpy(buf, "GetWornItem"), XS_Corpse_GetWornItem, file, "$$");
-		newXSproto(strcpy(buf, "RemoveItem"), XS_Corpse_RemoveItem, file, "$$");
-		newXSproto(strcpy(buf, "SetCash"), XS_Corpse_SetCash, file, "$$$$$");
-		newXSproto(strcpy(buf, "RemoveCash"), XS_Corpse_RemoveCash, file, "$");
-		newXSproto(strcpy(buf, "CountItems"), XS_Corpse_CountItems, file, "$");
-		newXSproto(strcpy(buf, "Delete"), XS_Corpse_Delete, file, "$");
-		newXSproto(strcpy(buf, "GetCopper"), XS_Corpse_GetCopper, file, "$");
-		newXSproto(strcpy(buf, "GetSilver"), XS_Corpse_GetSilver, file, "$");
-		newXSproto(strcpy(buf, "GetGold"), XS_Corpse_GetGold, file, "$");
-		newXSproto(strcpy(buf, "GetPlatinum"), XS_Corpse_GetPlatinum, file, "$");
-		newXSproto(strcpy(buf, "Summon"), XS_Corpse_Summon, file, "$$$");
-		newXSproto(strcpy(buf, "CastRezz"), XS_Corpse_CastRezz, file, "$$$");
-		newXSproto(strcpy(buf, "CompleteRezz"), XS_Corpse_CompleteRezz, file, "$");
-		newXSproto(strcpy(buf, "CanMobLoot"), XS_Corpse_CanMobLoot, file, "$$");
-		newXSproto(strcpy(buf, "AllowMobLoot"), XS_Corpse_AllowMobLoot, file, "$$$");
-		newXSproto(strcpy(buf, "AddLooter"), XS_Corpse_AddLooter, file, "$$");
-		newXSproto(strcpy(buf, "IsRezzed"), XS_Corpse_IsRezzed, file, "$");
+	newXSproto(strcpy(buf, "GetCharID"), XS_Corpse_GetCharID, file, "$");
+	newXSproto(strcpy(buf, "GetDecayTime"), XS_Corpse_GetDecayTime, file, "$");
+	newXSproto(strcpy(buf, "Lock"), XS_Corpse_Lock, file, "$");
+	newXSproto(strcpy(buf, "UnLock"), XS_Corpse_UnLock, file, "$");
+	newXSproto(strcpy(buf, "IsLocked"), XS_Corpse_IsLocked, file, "$");
+	newXSproto(strcpy(buf, "ResetLooter"), XS_Corpse_ResetLooter, file, "$");
+	newXSproto(strcpy(buf, "GetDBID"), XS_Corpse_GetDBID, file, "$");
+	newXSproto(strcpy(buf, "GetOwnerName"), XS_Corpse_GetOwnerName, file, "$");
+	newXSproto(strcpy(buf, "SetDecayTimer"), XS_Corpse_SetDecayTimer, file, "$$");
+	newXSproto(strcpy(buf, "IsEmpty"), XS_Corpse_IsEmpty, file, "$");
+	newXSproto(strcpy(buf, "AddItem"), XS_Corpse_AddItem, file, "$$$;$");
+	newXSproto(strcpy(buf, "GetWornItem"), XS_Corpse_GetWornItem, file, "$$");
+	newXSproto(strcpy(buf, "RemoveItem"), XS_Corpse_RemoveItem, file, "$$");
+	newXSproto(strcpy(buf, "SetCash"), XS_Corpse_SetCash, file, "$$$$$");
+	newXSproto(strcpy(buf, "RemoveCash"), XS_Corpse_RemoveCash, file, "$");
+	newXSproto(strcpy(buf, "CountItems"), XS_Corpse_CountItems, file, "$");
+	newXSproto(strcpy(buf, "Delete"), XS_Corpse_Delete, file, "$");
+	newXSproto(strcpy(buf, "GetCopper"), XS_Corpse_GetCopper, file, "$");
+	newXSproto(strcpy(buf, "GetSilver"), XS_Corpse_GetSilver, file, "$");
+	newXSproto(strcpy(buf, "GetGold"), XS_Corpse_GetGold, file, "$");
+	newXSproto(strcpy(buf, "GetPlatinum"), XS_Corpse_GetPlatinum, file, "$");
+	newXSproto(strcpy(buf, "Summon"), XS_Corpse_Summon, file, "$$$");
+	newXSproto(strcpy(buf, "CastRezz"), XS_Corpse_CastRezz, file, "$$$");
+	newXSproto(strcpy(buf, "CompleteRezz"), XS_Corpse_CompleteRezz, file, "$");
+	newXSproto(strcpy(buf, "CanMobLoot"), XS_Corpse_CanMobLoot, file, "$$");
+	newXSproto(strcpy(buf, "AllowMobLoot"), XS_Corpse_AllowMobLoot, file, "$$$");
+	newXSproto(strcpy(buf, "AddLooter"), XS_Corpse_AddLooter, file, "$$");
+	newXSproto(strcpy(buf, "IsRezzed"), XS_Corpse_IsRezzed, file, "$");
 	XSRETURN_YES;
 }