Tactics refactoring