More Dxf code refactoring