Tactical refactor