Fixed some formatting, removed junk data (like the isWeapon boolean and
all methods related to it)