Redesign code