Fight refactoring