Refactor drawing of control points.