Improve, Cleanup & Comment Custom2DGeometry