Refactor while in DrawPad.Run