refactor fighter stuff