Refactor weapon into new class