A bit of refactoring of how fighting is done