Made WeaponSelect follow coding guidelines