Refactor Fighter to add index