Working at fighting system. Small refactoring