Refactored weapons