Sketcher is the 2D constrained drawing workbench in FreeCAD. While a powerful tool making the backbone for more complex 3D workbenches, all the years of development has added a significant bloat to the code-base. This includes 10,000+ line files and 1000+ line functions with little to no testing.

In this talk I will present the method and progress in the ongoing effort to refactor the Sketcher workbench in FreeCAD, such that it is more maintainable and extensible for the future. Topics covered include identifying places for improvement in the first place, adding tests, and finally* methods of refactoring.