Refactoring of the SketchBoard first draft