Push refactoring