Combat refactorings