Antiglobal refactoring