Refactoring immigrants