refactor Fighting