Code redesign