Rework code