Global rework in code