Refactor fight