Push refactor