Minor improvements

I just did a very minor cleanup of one function: hasEnergyWeapon()